commit:     8447ae886cb4465129e8687f38cea0e6d784c4ef
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue May  5 21:26:42 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue May  5 21:28:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8447ae88

meson.eclass: append /usr/share/pkgconfig to PKG_CONFIG_PATH

Bug: https://bugs.gentoo.org/720866
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 eclass/meson.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 5e50dd75705..340dbfd1ff9 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -327,8 +327,8 @@ meson_src_configure() {
                --prefix "${EPREFIX}/usr"
                --sysconfdir "${EPREFIX}/etc"
                --wrap-mode nodownload
-               --build.pkg-config-path "${EPREFIX}/usr/share/pkgconfig"
-               --pkg-config-path "${EPREFIX}/usr/share/pkgconfig"
+               --build.pkg-config-path 
"${BUILD_PKG_CONFIG_PATH}${BUILD_PKG_CONFIG_PATH:+:}${EPREFIX}/usr/share/pkgconfig"
+               --pkg-config-path 
"${PKG_CONFIG_PATH}${PKG_CONFIG_PATH:+:}${EPREFIX}/usr/share/pkgconfig"
                --native-file "$(_meson_create_native_file)"
        )
 

Reply via email to