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

diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
index a1119c66a8d9127aa75f53aa2bcb2b37010dc055..efb880f705d236fb0e9f7300fb435f82c01e6240 100644 (file)
--- 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 97ed77bde110f9e35e941e305955f2947bcf48ca..8b858b94d1b68b72e6aa46bab4c1b0a4e1fbd6e8 100644 (file)
--- 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 31f6de36737e129170759b69c9859ad41961be86..0657ec6b06e726b6f81f835322a96bedc68df085 100644 (file)
--- 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 835dd842361e9daa51d00fb15dedea175936eb9b..5d435fe1fc8553e6a4c12df34b5d7cdf2a65bf0a 100644 (file)
--- 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 31f6de36737e129170759b69c9859ad41961be86..0657ec6b06e726b6f81f835322a96bedc68df085 100644 (file)
--- 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