From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 22F721396DA for ; Mon, 13 Nov 2017 22:40:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E708E1046; Mon, 13 Nov 2017 22:40:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 264DEE1046 for ; Mon, 13 Nov 2017 22:40:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D655B34069A for ; Mon, 13 Nov 2017 22:40:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7A1C497BE for ; Mon, 13 Nov 2017 22:40:03 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1510612774.291314d035d8fcbeb438df80a8c21c66c81169b4.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgconfig/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild dev-util/pkgconfig/pkgconfig-0.29.1.ebuild dev-util/pkgconfig/pkgconfig-0.29.2.ebuild dev-util/pkgconfig/pkgconfig-9999.ebuild X-VCS-Directories: dev-util/pkgconfig/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 291314d035d8fcbeb438df80a8c21c66c81169b4 X-VCS-Branch: master Date: Mon, 13 Nov 2017 22:40:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8edb7565-2c81-468c-8025-f05affcd96cf X-Archives-Hash: 1f0df983dd23b67518c93bf29f9c9d9a commit: 291314d035d8fcbeb438df80a8c21c66c81169b4 Author: James Le Cuirot gentoo org> AuthorDate: Mon Nov 13 22:36:16 2017 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Mon Nov 13 22:39:34 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=291314d0 dev-util/pkgconfig: Check for existing pkgconfig in / and not ROOT It is the pkgconfig in / that is used for building. While it is unlikely to be missing when cross-compiling, technically the forced GLIB_CFLAGS should be prefixed with SYSROOT. Let's revisit that in EAPI 7. Package-Manager: Portage-2.3.13, Repoman-2.3.4 dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild | 2 +- dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild | 2 +- dev-util/pkgconfig/pkgconfig-0.29.1.ebuild | 2 +- dev-util/pkgconfig/pkgconfig-0.29.2.ebuild | 2 +- dev-util/pkgconfig/pkgconfig-9999.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild index a1119c66a8d..efb880f705d 100644 --- a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild +++ b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild @@ -61,7 +61,7 @@ multilib_src_configure() { append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" fi else - if ! has_version dev-util/pkgconfig; then + if ! has_version --host-root dev-util/pkgconfig; then export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" export GLIB_LIBS="-lglib-2.0" fi diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild index 97ed77bde11..8b858b94d1b 100644 --- a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild +++ b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild @@ -71,7 +71,7 @@ multilib_src_configure() { append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" fi else - if ! has_version dev-util/pkgconfig; then + if ! has_version --host-root dev-util/pkgconfig; then export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" export GLIB_LIBS="-lglib-2.0" fi diff --git a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild index 31f6de36737..0657ec6b06e 100644 --- a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild +++ b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild @@ -83,7 +83,7 @@ multilib_src_configure() { fi fi else - if ! has_version dev-util/pkgconfig; then + if ! has_version --host-root dev-util/pkgconfig; then export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" export GLIB_LIBS="-lglib-2.0" fi diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild index 835dd842361..5d435fe1fc8 100644 --- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild +++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild @@ -83,7 +83,7 @@ multilib_src_configure() { fi fi else - if ! has_version dev-util/pkgconfig; then + if ! has_version --host-root dev-util/pkgconfig; then export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" export GLIB_LIBS="-lglib-2.0" fi diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild index 31f6de36737..0657ec6b06e 100644 --- a/dev-util/pkgconfig/pkgconfig-9999.ebuild +++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild @@ -83,7 +83,7 @@ multilib_src_configure() { fi fi else - if ! has_version dev-util/pkgconfig; then + if ! has_version --host-root dev-util/pkgconfig; then export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" export GLIB_LIBS="-lglib-2.0" fi