[gentoo-commits] repo/gentoo:master commit in: dev-util/pkgconfig/

[James Le Cuirot]

commit:     291314d035d8fcbeb438df80a8c21c66c81169b4
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 13 22:36:16 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> 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