From 5107b84dd26f95cc4d0a70bce0f605c9ec8c3154 Mon Sep 17 00:00:00 2001 From: Matias Fonzo Date: Fri, 20 Oct 2017 16:15:32 -0300 Subject: [PATCH] change PKG_CONFIG_PATH to include /usr//share/pkgconfig --- archive/pkgconf/etc/profile.d/pkgconf.sh | 6 ++++-- enter-chroot | 2 +- recipes/devel/pkgconf/recipe | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/archive/pkgconf/etc/profile.d/pkgconf.sh b/archive/pkgconf/etc/profile.d/pkgconf.sh index f231983b..f4dfaccb 100644 --- a/archive/pkgconf/etc/profile.d/pkgconf.sh +++ b/archive/pkgconf/etc/profile.d/pkgconf.sh @@ -1,9 +1,11 @@ # Set PKG_CONFIG and PKG_CONFIG_PATH if unset + test -n "${PKG_CONFIG+$PKG_CONFIG}" || \ - PKG_CONFIG=/usr/bin/pkgconf + PKG_CONFIG=/usr/bin/pkgconf + test -n "${PKG_CONFIG_PATH+$PKG_CONFIG_PATH}" || \ - PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig + PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig export PKG_CONFIG PKG_CONFIG_PATH diff --git a/enter-chroot b/enter-chroot index b6065f80..a14b1c2b 100755 --- a/enter-chroot +++ b/enter-chroot @@ -117,6 +117,6 @@ chroot "$rootdir" /tools/bin/env -i \ LC_ALL=C \ LANGUAGE=C \ PKG_CONFIG=/usr/bin/pkgconf \ - PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig \ + PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig \ /bin/sh - diff --git a/recipes/devel/pkgconf/recipe b/recipes/devel/pkgconf/recipe index e5ba3c88..e5e0d946 100644 --- a/recipes/devel/pkgconf/recipe +++ b/recipes/devel/pkgconf/recipe @@ -48,7 +48,7 @@ build() --docdir=$docsdir \ --enable-static \ --enable-shared \ - --with-pkg-config-dir=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig \ + --with-pkg-config-dir=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig \ --build="$(cc -dumpmachine)" make -j${jobs} V=1 -- 2.11.4.GIT