| 1 |
commit: df84b838697926b5967a25c220d13ef2946cc5d9 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 3 22:11:54 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 3 22:17:09 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df84b838 |
| 7 |
|
| 8 |
meson.eclass: use a subshell to unexport variables temporarily |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/meson.eclass | 34 ++++++++++++++++++---------------- |
| 13 |
1 file changed, 18 insertions(+), 16 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
| 16 |
index 393286cbe5e..5e50dd75705 100644 |
| 17 |
--- a/eclass/meson.eclass |
| 18 |
+++ b/eclass/meson.eclass |
| 19 |
@@ -366,22 +366,24 @@ meson_src_configure() { |
| 20 |
# https://bugs.gentoo.org/625396 |
| 21 |
python_export_utf8_locale |
| 22 |
|
| 23 |
- # https://bugs.gentoo.org/720818 |
| 24 |
- export -n {C,CPP,CXX,F,FC,OBJC,OBJCXX,LD}FLAGS PKG_CONFIG_{LIBDIR,PATH} |
| 25 |
- |
| 26 |
- # https://bugs.gentoo.org/720860 |
| 27 |
- if ver_test "$(meson --version)" -lt "0.54"; then |
| 28 |
- local -x CFLAGS=${BUILD_CFLAGS} |
| 29 |
- local -x CPPFLAGS=${BUILD_CPPFLAGS} |
| 30 |
- local -x CXXFLAGS=${BUILD_CXXFLAGS} |
| 31 |
- local -x FFLAGS=${BUILD_FCFLAGS} |
| 32 |
- local -x OBJCFLAGS=${BUILD_OBJCFLAGS} |
| 33 |
- local -x OBJCXXFLAGS=${BUILD_OBJCXXFLAGS} |
| 34 |
- local -x LDFLAGS=${BUILD_LDFLAGS} |
| 35 |
- fi |
| 36 |
- |
| 37 |
- echo "${mesonargs[@]}" >&2 |
| 38 |
- "${mesonargs[@]}" || die |
| 39 |
+ ( |
| 40 |
+ # https://bugs.gentoo.org/720860 |
| 41 |
+ if ver_test "$(meson --version)" -lt "0.54"; then |
| 42 |
+ local -x CFLAGS=${BUILD_CFLAGS} |
| 43 |
+ local -x CPPFLAGS=${BUILD_CPPFLAGS} |
| 44 |
+ local -x CXXFLAGS=${BUILD_CXXFLAGS} |
| 45 |
+ local -x FFLAGS=${BUILD_FCFLAGS} |
| 46 |
+ local -x OBJCFLAGS=${BUILD_OBJCFLAGS} |
| 47 |
+ local -x OBJCXXFLAGS=${BUILD_OBJCXXFLAGS} |
| 48 |
+ local -x LDFLAGS=${BUILD_LDFLAGS} |
| 49 |
+ else |
| 50 |
+ # https://bugs.gentoo.org/720818 |
| 51 |
+ export -n {C,CPP,CXX,F,OBJC,OBJCXX,LD}FLAGS PKG_CONFIG_{LIBDIR,PATH} |
| 52 |
+ fi |
| 53 |
+ |
| 54 |
+ echo "${mesonargs[@]}" >&2 |
| 55 |
+ "${mesonargs[@]}" |
| 56 |
+ ) || die |
| 57 |
} |
| 58 |
|
| 59 |
# @FUNCTION: meson_src_compile |
Archives