meson.eclass: append /usr/share/pkgconfig to PKG_CONFIG_PATH
authorMike Gilbert <floppym@gentoo.org>
Tue, 5 May 2020 21:26:42 +0000 (17:26 -0400)
committerMike Gilbert <floppym@gentoo.org>
Tue, 5 May 2020 21:28:05 +0000 (17:28 -0400)
Bug: https://bugs.gentoo.org/720866
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
eclass/meson.eclass

index 5e50dd75705d312afe3ff3af65774c51d4805295..340dbfd1ff9571ff5948ab5132fe88f60972ebb4 100644 (file)
@@ -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)"
        )