| 1 |
commit: a533fc39bfcb06c29952c5c8afecb4bab4533a8b |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 3 17:49:10 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 3 17:54:46 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a533fc39 |
| 7 |
|
| 8 |
meson.eclass: respect PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR |
| 9 |
|
| 10 |
Respect PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR if set before |
| 11 |
meson_src_configure. |
| 12 |
|
| 13 |
Add BUILD variants for use in cross-compiles. |
| 14 |
|
| 15 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 16 |
|
| 17 |
eclass/meson.eclass | 14 +++++++++----- |
| 18 |
1 file changed, 9 insertions(+), 5 deletions(-) |
| 19 |
|
| 20 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
| 21 |
index 773413bb602..2d2685ca72a 100644 |
| 22 |
--- a/eclass/meson.eclass |
| 23 |
+++ b/eclass/meson.eclass |
| 24 |
@@ -193,7 +193,7 @@ _meson_create_cross_file() { |
| 25 |
objcpp_link_args = $(_meson_env_array "${OBJCXXFLAGS} ${LDFLAGS}") |
| 26 |
needs_exe_wrapper = true |
| 27 |
sys_root = '${SYSROOT}' |
| 28 |
- pkg_config_libdir = '${EPREFIX}/usr/$(get_libdir)/pkgconfig' |
| 29 |
+ pkg_config_libdir = '${PKG_CONFIG_LIBDIR:-${EPREFIX}/usr/$(get_libdir)/pkgconfig}' |
| 30 |
|
| 31 |
[host_machine] |
| 32 |
system = '${system}' |
| 33 |
@@ -242,7 +242,7 @@ _meson_create_native_file() { |
| 34 |
objcpp_args = $(_meson_env_array "${BUILD_OBJCXXFLAGS} ${BUILD_CPPFLAGS}") |
| 35 |
objcpp_link_args = $(_meson_env_array "${BUILD_OBJCXXFLAGS} ${BUILD_LDFLAGS}") |
| 36 |
needs_exe_wrapper = false |
| 37 |
- pkg_config_libdir = '${EPREFIX}/usr/$(get_libdir)/pkgconfig' |
| 38 |
+ pkg_config_libdir = '${BUILD_PKG_CONFIG_LIBDIR:-${EPREFIX}/usr/$(get_libdir)/pkgconfig}' |
| 39 |
|
| 40 |
[build_machine] |
| 41 |
system = '${system}' |
| 42 |
@@ -294,6 +294,8 @@ meson_src_configure() { |
| 43 |
local BUILD_OBJCFLAGS=${BUILD_OBJCFLAGS} |
| 44 |
local BUILD_OBJCXXFLAGS=${BUILD_OBJCXXFLAGS} |
| 45 |
local BUILD_LDFLAGS=${BUILD_LDFLAGS} |
| 46 |
+ local BUILD_PKG_CONFIG_LIBDIR=${BUILD_PKG_CONFIG_LIBDIR} |
| 47 |
+ local BUILD_PKG_CONFIG_PATH=${BUILD_PKG_CONFIG_PATH} |
| 48 |
|
| 49 |
if tc-is-cross-compiler; then |
| 50 |
: ${BUILD_CFLAGS:=-O1 -pipe} |
| 51 |
@@ -309,6 +311,8 @@ meson_src_configure() { |
| 52 |
: ${BUILD_LDFLAGS:=${LDFLAGS}} |
| 53 |
: ${BUILD_OBJCFLAGS:=${OBJCFLAGS}} |
| 54 |
: ${BUILD_OBJCXXFLAGS:=${OBJCXXFLAGS}} |
| 55 |
+ : ${BUILD_PKG_CONFIG_LIBDIR:=${PKG_CONFIG_LIBDIR}} |
| 56 |
+ : ${BUILD_PKG_CONFIG_PATH:=${PKG_CONFIG_PATH}} |
| 57 |
fi |
| 58 |
|
| 59 |
local mesonargs=( |
| 60 |
@@ -319,8 +323,8 @@ meson_src_configure() { |
| 61 |
--prefix "${EPREFIX}/usr" |
| 62 |
--sysconfdir "${EPREFIX}/etc" |
| 63 |
--wrap-mode nodownload |
| 64 |
- --build.pkg-config-path="${EPREFIX}/usr/share/pkgconfig" |
| 65 |
- --pkg-config-path="${EPREFIX}/usr/share/pkgconfig" |
| 66 |
+ --build.pkg-config-path "${BUILD_PKG_CONFIG_PATH:-${EPREFIX}/usr/share/pkgconfig}" |
| 67 |
+ --pkg-config-path "${PKG_CONFIG_PATH:-${EPREFIX}/usr/share/pkgconfig}" |
| 68 |
--native-file "$(_meson_create_native_file)" |
| 69 |
) |
| 70 |
|
| 71 |
@@ -359,7 +363,7 @@ meson_src_configure() { |
| 72 |
python_export_utf8_locale |
| 73 |
|
| 74 |
# https://bugs.gentoo.org/720818 |
| 75 |
- export -n {C,CPP,CXX,F,FC,OBJC,OBJCXX,LD}FLAGS |
| 76 |
+ export -n {C,CPP,CXX,F,FC,OBJC,OBJCXX,LD}FLAGS PKG_CONFIG_{LIBDIR,PATH} |
| 77 |
|
| 78 |
echo "${mesonargs[@]}" >&2 |
| 79 |
"${mesonargs[@]}" || die |
Archives