diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2017-11-13 22:36:16 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2017-11-13 22:39:34 +0000 |
| commit | 291314d035d8fcbeb438df80a8c21c66c81169b4 (patch) | |
| tree | 0a9ca833359d62cadd37cd7e2b22c8dc4cbc79b7 /dev-util | |
| parent | net-libs/libtorrent-rasterbar: stable 1.1.5-r1 for ppc, bug #623152 (diff) | |
| download | gentoo-291314d035d8fcbeb438df80a8c21c66c81169b4.tar.gz gentoo-291314d035d8fcbeb438df80a8c21c66c81169b4.tar.bz2 gentoo-291314d035d8fcbeb438df80a8c21c66c81169b4.zip | |
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
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/pkgconfig/pkgconfig-0.29.1.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/pkgconfig/pkgconfig-0.29.2.ebuild | 2 | ||||
| -rw-r--r-- | 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 a1119c66a8d9..efb880f705d2 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 97ed77bde110..8b858b94d1b6 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 31f6de36737e..0657ec6b06e7 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 835dd842361e..5d435fe1fc85 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 31f6de36737e..0657ec6b06e7 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 |