| 1 |
commit: 291314d035d8fcbeb438df80a8c21c66c81169b4 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 13 22:36:16 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 13 22:39:34 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=291314d0 |
| 7 |
|
| 8 |
dev-util/pkgconfig: Check for existing pkgconfig in / and not ROOT |
| 9 |
|
| 10 |
It is the pkgconfig in / that is used for building. While it is |
| 11 |
unlikely to be missing when cross-compiling, technically the forced |
| 12 |
GLIB_CFLAGS should be prefixed with SYSROOT. Let's revisit that in |
| 13 |
EAPI 7. |
| 14 |
|
| 15 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
| 16 |
|
| 17 |
dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild | 2 +- |
| 18 |
dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild | 2 +- |
| 19 |
dev-util/pkgconfig/pkgconfig-0.29.1.ebuild | 2 +- |
| 20 |
dev-util/pkgconfig/pkgconfig-0.29.2.ebuild | 2 +- |
| 21 |
dev-util/pkgconfig/pkgconfig-9999.ebuild | 2 +- |
| 22 |
5 files changed, 5 insertions(+), 5 deletions(-) |
| 23 |
|
| 24 |
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild |
| 25 |
index a1119c66a8d..efb880f705d 100644 |
| 26 |
--- a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild |
| 27 |
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild |
| 28 |
@@ -61,7 +61,7 @@ multilib_src_configure() { |
| 29 |
append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" |
| 30 |
fi |
| 31 |
else |
| 32 |
- if ! has_version dev-util/pkgconfig; then |
| 33 |
+ if ! has_version --host-root dev-util/pkgconfig; then |
| 34 |
export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" |
| 35 |
export GLIB_LIBS="-lglib-2.0" |
| 36 |
fi |
| 37 |
|
| 38 |
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild |
| 39 |
index 97ed77bde11..8b858b94d1b 100644 |
| 40 |
--- a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild |
| 41 |
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild |
| 42 |
@@ -71,7 +71,7 @@ multilib_src_configure() { |
| 43 |
append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" |
| 44 |
fi |
| 45 |
else |
| 46 |
- if ! has_version dev-util/pkgconfig; then |
| 47 |
+ if ! has_version --host-root dev-util/pkgconfig; then |
| 48 |
export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" |
| 49 |
export GLIB_LIBS="-lglib-2.0" |
| 50 |
fi |
| 51 |
|
| 52 |
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild |
| 53 |
index 31f6de36737..0657ec6b06e 100644 |
| 54 |
--- a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild |
| 55 |
+++ b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild |
| 56 |
@@ -83,7 +83,7 @@ multilib_src_configure() { |
| 57 |
fi |
| 58 |
fi |
| 59 |
else |
| 60 |
- if ! has_version dev-util/pkgconfig; then |
| 61 |
+ if ! has_version --host-root dev-util/pkgconfig; then |
| 62 |
export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" |
| 63 |
export GLIB_LIBS="-lglib-2.0" |
| 64 |
fi |
| 65 |
|
| 66 |
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild |
| 67 |
index 835dd842361..5d435fe1fc8 100644 |
| 68 |
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild |
| 69 |
+++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild |
| 70 |
@@ -83,7 +83,7 @@ multilib_src_configure() { |
| 71 |
fi |
| 72 |
fi |
| 73 |
else |
| 74 |
- if ! has_version dev-util/pkgconfig; then |
| 75 |
+ if ! has_version --host-root dev-util/pkgconfig; then |
| 76 |
export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" |
| 77 |
export GLIB_LIBS="-lglib-2.0" |
| 78 |
fi |
| 79 |
|
| 80 |
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild |
| 81 |
index 31f6de36737..0657ec6b06e 100644 |
| 82 |
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild |
| 83 |
+++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild |
| 84 |
@@ -83,7 +83,7 @@ multilib_src_configure() { |
| 85 |
fi |
| 86 |
fi |
| 87 |
else |
| 88 |
- if ! has_version dev-util/pkgconfig; then |
| 89 |
+ if ! has_version --host-root dev-util/pkgconfig; then |
| 90 |
export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" |
| 91 |
export GLIB_LIBS="-lglib-2.0" |
| 92 |
fi |
Archives