From patchwork Tue Sep 11 09:37:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 146429 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp3432817ljw; Tue, 11 Sep 2018 02:37:56 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZwAjpq18wWPs8HUKhg7IOSucIEFxltRU2QryEMS0lV1ruM1cZY6//iUEGcKPgIJTlK58Zs X-Received: by 2002:a17:902:bd44:: with SMTP id b4-v6mr26267742plx.144.1536658676050; Tue, 11 Sep 2018 02:37:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536658676; cv=none; d=google.com; s=arc-20160816; b=yNwanIrDmcKTqOd6jZjUkxyKV3ifAxHfBhiLg0UHllXE2X84Gy8mxhbGsRTYTHDXiK Sszrja5dGWZf+D1Jxkcp/0qcBhFS+6Ff5XjVFXXvdTsQjxOyqrLcLH0DQ/JROXTwAiVq L64H8ETv91/PBRPYYL3ifp+3Vz0zpr8Y8TkfToA/qUrZ0bILUCOiHezaRsuKJTcbYBWI o8sBCcfUPsEOItBvg1sIEGOWIbDgHoUP8ToY7wlr52JSmeODfdrWdylTR34oJBJ6OJ73 cKXdvc4A7bSscsySlorA3ZEkxm24b4diwj5EiX3DJ/gEiJ98hVBRC9NCV1v7Q5ByhmgG K6Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=CN9ALLdcIJAQt6vPNnB1Ac+BKoZiz/gCZM7JQjpeTlY=; b=D4+BzgVaPswXBMaPOyZ6ilpFPnOT/gBsKivOUDD0K5LnjcrPzllqjazE+fdR+t8HKF qgaHZKjd4+PPHA4qllHqGTDwvs/nA+9QHNxQYSxeiaOr3RL1DWnfDEuJn123Z+g+MeQF 7jnUIAiWwdoKckEjHGXCPiYoCGgv0BNeViKNvR6DehpW1HBmBgl2GObKXZGazxs/bgst 9DHacwmTUg4sWRqF9McmYBO76ctWt1+cjKvhw4VwFMFC1E4JfMjtliNjbtvcKaHABDN8 EBVgONN9JSd1yUFpqSuWYuss7Fse+6jTlvGYQZfat/tLaItgcOs3m28A6bcquDtuCcie kMMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=iB5POn08; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id w3-v6si19318544pgb.119.2018.09.11.02.37.55; Tue, 11 Sep 2018 02:37:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=iB5POn08; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 15BA779864; Tue, 11 Sep 2018 09:37:49 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mail.openembedded.org (Postfix) with ESMTP id 5362F79855 for ; Tue, 11 Sep 2018 09:37:47 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id s14-v6so16086043wrw.6 for ; Tue, 11 Sep 2018 02:37:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=4CWYX/2z/ESkYso4tDkc+j16dH+NQgHiOjfMfwKssbA=; b=iB5POn08Yw+SaQFLcw2LBg540X4FDU5hQFTjrXlFD9Eyh0CjF8k3pbtAOlJZPoKDR8 k57dlm4X5AxVL8k8FrQLsYxgNfhqrYicMaJbulDSuMFDMfkLKGq5fQ+2Jbne9yGlZXTb IYq0I3yzd5BYhue8c+acx+knKvSJ/HLHw+FzjlclnorbKwjAkS7B9ptMkcbwy8sOMFVl GXaLUOmgVi4cjFmWm0f64hZV2e1SAWOsSXMHCiUvUfHTqfRFplvkR2g6C+AjmJvqN9+a z5D1CtmeZqp5M8UH1xr05abUvPSnGThIIT+lDsF/rJRguAMduHAATp0Oo8a+/AR4oPu7 O9mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=4CWYX/2z/ESkYso4tDkc+j16dH+NQgHiOjfMfwKssbA=; b=rOzae3rVFmHnS1QuXfPN9fD/6KTN3c7LPuDsxAh3GDCEpPOYviCIvpj2ypadr41qmF WtlTF8/HrX8ySsI06pXDOxBTdIb18VlM19JK1laFDeLTc/lMLtXWbEVZ8dm4tQxGuUWw NMCTjGGHskel2Gx6XekEaVxoxYFBPy7u0ylXKkBD4BX1sNt3CuXAm6h/4G1jmQ0admF4 yJRKqzgVYnuamqhAmlLt0sFyecvS0OBBOaZgqIFh3Q6SGv7PKwgmTP7ag3CLG8LxZ540 D2Nb0+o7LTJxHq3zdi0ml9/EgLM7auIqqna5cS71Zv4RKrxB9EGnTEVC72M19G2BAGSu EHMA== X-Gm-Message-State: APzg51Dik+HRD+T13sdxS2TWIcqEruf7YPjI3O0OC0OukP9hfFtwY/Fp 0Q/gvGIQMVbnMGDq8ty1UIupGzAf1Yg= X-Received: by 2002:adf:c684:: with SMTP id j4-v6mr17551751wrg.243.1536658667694; Tue, 11 Sep 2018 02:37:47 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id a11-v6sm16636609wrr.81.2018.09.11.02.37.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Sep 2018 02:37:47 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 11 Sep 2018 10:37:45 +0100 Message-Id: <20180911093745.5397-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] pkgconf: don't use alternatives X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org There's no need to do alternatives as pkgconf and pkg-config won't be installed at the same time, and pkg-config doesn't do alternatives either. Signed-off-by: Ross Burton --- meta/recipes-devtools/pkgconf/pkgconf_1.5.3.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/pkgconf/pkgconf_1.5.3.bb b/meta/recipes-devtools/pkgconf/pkgconf_1.5.3.bb index 2021d1ac602..415478d5cf9 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_1.5.3.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_1.5.3.bb @@ -24,7 +24,7 @@ SRC_URI = "\ SRC_URI[md5sum] = "c21743bca14c882c0f282746168a5edc" SRC_URI[sha256sum] = "d3468308553c94389dadfd10c4d1067269052b5364276a9d24a643c88485f715" -inherit autotools update-alternatives +inherit autotools EXTRA_OECONF += "--with-pkg-config-dir='${libdir}/pkgconfig:${datadir}/pkgconfig'" @@ -46,8 +46,6 @@ do_install_append_class-native () { install -m755 ${B}/pkg-config-esdk ${D}${bindir}/pkg-config-esdk } -ALTERNATIVE_${PN} = "pkg-config" - # When using the RPM generated automatic package dependencies, some packages # will end up requiring 'pkgconfig(pkg-config)'. Allow this behavior by # specifying an appropriate provide.