[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Gilbert]

commit:     df84b838697926b5967a25c220d13ef2946cc5d9
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May  3 22:11:54 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May  3 22:17:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df84b838

meson.eclass: use a subshell to unexport variables temporarily

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 eclass/meson.eclass | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 393286cbe5e..5e50dd75705 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -366,22 +366,24 @@ meson_src_configure() {
        # https://bugs.gentoo.org/625396
        python_export_utf8_locale
 
-       # https://bugs.gentoo.org/720818
-       export -n {C,CPP,CXX,F,FC,OBJC,OBJCXX,LD}FLAGS PKG_CONFIG_{LIBDIR,PATH}
-
-       # https://bugs.gentoo.org/720860
-       if ver_test "$(meson --version)" -lt "0.54"; then
-               local -x CFLAGS=${BUILD_CFLAGS}
-               local -x CPPFLAGS=${BUILD_CPPFLAGS}
-               local -x CXXFLAGS=${BUILD_CXXFLAGS}
-               local -x FFLAGS=${BUILD_FCFLAGS}
-               local -x OBJCFLAGS=${BUILD_OBJCFLAGS}
-               local -x OBJCXXFLAGS=${BUILD_OBJCXXFLAGS}
-               local -x LDFLAGS=${BUILD_LDFLAGS}
-       fi
-
-       echo "${mesonargs[@]}" >&2
-       "${mesonargs[@]}" || die
+       (
+               # https://bugs.gentoo.org/720860
+               if ver_test "$(meson --version)" -lt "0.54"; then
+                       local -x CFLAGS=${BUILD_CFLAGS}
+                       local -x CPPFLAGS=${BUILD_CPPFLAGS}
+                       local -x CXXFLAGS=${BUILD_CXXFLAGS}
+                       local -x FFLAGS=${BUILD_FCFLAGS}
+                       local -x OBJCFLAGS=${BUILD_OBJCFLAGS}
+                       local -x OBJCXXFLAGS=${BUILD_OBJCXXFLAGS}
+                       local -x LDFLAGS=${BUILD_LDFLAGS}
+               else
+                       # https://bugs.gentoo.org/720818
+                       export -n {C,CPP,CXX,F,OBJC,OBJCXX,LD}FLAGS 
PKG_CONFIG_{LIBDIR,PATH}
+               fi
+
+               echo "${mesonargs[@]}" >&2
+               "${mesonargs[@]}"
+       ) || die
 }
 
 # @FUNCTION: meson_src_compile