| 1 |
commit: 8447ae886cb4465129e8687f38cea0e6d784c4ef |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 5 21:26:42 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 5 21:28:05 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8447ae88 |
| 7 |
|
| 8 |
meson.eclass: append /usr/share/pkgconfig to PKG_CONFIG_PATH |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/720866 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
eclass/meson.eclass | 4 ++-- |
| 14 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
| 17 |
index 5e50dd75705..340dbfd1ff9 100644 |
| 18 |
--- a/eclass/meson.eclass |
| 19 |
+++ b/eclass/meson.eclass |
| 20 |
@@ -327,8 +327,8 @@ meson_src_configure() { |
| 21 |
--prefix "${EPREFIX}/usr" |
| 22 |
--sysconfdir "${EPREFIX}/etc" |
| 23 |
--wrap-mode nodownload |
| 24 |
- --build.pkg-config-path "${EPREFIX}/usr/share/pkgconfig" |
| 25 |
- --pkg-config-path "${EPREFIX}/usr/share/pkgconfig" |
| 26 |
+ --build.pkg-config-path "${BUILD_PKG_CONFIG_PATH}${BUILD_PKG_CONFIG_PATH:+:}${EPREFIX}/usr/share/pkgconfig" |
| 27 |
+ --pkg-config-path "${PKG_CONFIG_PATH}${PKG_CONFIG_PATH:+:}${EPREFIX}/usr/share/pkgconfig" |
| 28 |
--native-file "$(_meson_create_native_file)" |
| 29 |
) |
Archives