diff options
| author |   Steven J Newbury <steve@snewbury.org.uk> | 2009-04-23 01:18:30 +0100 |
|---|---|---|
| committer | Steven J Newbury <steve@snewbury.org.uk> | 2009-04-23 01:18:30 +0100 |
| commit | b7e5c136c55ed308c82492c0531c45f7e1641d5f (patch) | |
| tree | 4b71b835bbf7d459c65886abcb62968a32a6715a /eclass | |
| parent | Reduce multilib_debug output (diff) | |
| download | multilib-portage-b7e5c136c55ed308c82492c0531c45f7e1641d5f.tar.gz multilib-portage-b7e5c136c55ed308c82492c0531c45f7e1641d5f.tar.bz2 multilib-portage-b7e5c136c55ed308c82492c0531c45f7e1641d5f.zip | |
Be more selective about saving some env vars
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/multilib-native.eclass | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/eclass/multilib-native.eclass b/eclass/multilib-native.eclass index ec9b6ce4e..b2bad6e54 100644 --- a/eclass/multilib-native.eclass +++ b/eclass/multilib-native.eclass @@ -30,14 +30,10 @@ esac # @DESCRIPTION: Environment variables to save # EMULTILIB_SAVE_VARS="${EMULTILIB_SAVE_VARS} # AS CC CXX FC LD ASFLAGS CFLAGS CXXFLAGS FCFLAGS FFLAGS LDFLAGS -# CHOST CBUILD CDEFINE LIBDIR S ECONF_SOURCE KDE_S -# CMAKE_BUILD_DIR CCACHE_DIR QTBINDIR QMAKE QMAKESPEC myconf -# mycmakeargs PYTHON PERLBIN" +# CHOST CBUILD CDEFINE LIBDIR S CCACHE_DIR myconf PYTHON PERLBIN" EMULTILIB_SAVE_VARS="${EMULTILIB_SAVE_VARS} AS CC CXX FC LD ASFLAGS CFLAGS CXXFLAGS FCFLAGS FFLAGS LDFLAGS - CHOST CBUILD CDEFINE LIBDIR S ECONF_SOURCE KDE_S - CMAKE_BUILD_DIR CCACHE_DIR QTBINDIR QMAKE QMAKESPEC myconf - mycmakeargs PYTHON PERLBIN" + CHOST CBUILD CDEFINE LIBDIR S CCACHE_DIR myconf PYTHON PERLBIN" # @VARIABLE: EMULTILIB_SOURCE_TOP_DIRNAME # @DESCRIPTION: On initialisation of multilib environment this gets incremented by 1 @@ -237,6 +233,9 @@ multilib-native_setup_abi_env() { QTBINDIR="/usr/bin" fi QMAKE="${QTBINDIR}/qmake" + # Add QT variables to saved vars + EMULTILIB_SAVE_VARS="${EMULTILIB_SAVE_VARS} QMAKE QMAKESPEC QTBINDIR" + fi # If we aren't building for the DEFAULT ABI we may need to use some @@ -263,16 +262,20 @@ multilib-native_setup_abi_env() { CMAKE_BUILD_DIR="${WORKDIR}/${PN}_build_${ABI}/${EMULTILIB_RELATIVE_BUILD_DIR/${EMULTILIB_SOURCE_TOP_DIRNAME}}" [[ -n "${CMAKE_IN_SOURCE_BUILD}" ]] && \ S="${CMAKE_BUILD_DIR}" + EMULTILIB_SAVE_VARS="${EMULTILIB_SAVE_VARS} CMAKE_BUILD_DIR mycmakeargs" else S="${WORKDIR}/${PN}_build_${ABI}/${EMULTILIB_RELATIVE_BUILD_DIR/${EMULTILIB_SOURCE_TOP_DIRNAME}}" if [[ -n ${MULTILIB_EXT_SOURCE_BUILD} ]]; then ECONF_SOURCE="${EMULTILIB_SOURCE_TOPDIR}/${EMULTILIB_RELATIVE_BUILD_DIR/${EMULTILIB_SOURCE_TOP_DIRNAME}}" + EMULTILIB_SAVE_VARS="${EMULTILIB_SAVE_VARS} ECONF_SOURCE" + fi fi # If KDE_S is defined then the kde.eclass is in use if [[ -n ${KDE_S} ]]; then KDE_S="${S}" + EMULTILIB_SAVE_VARS="${EMULTILIB_SAVE_VARS} KDE_S" fi # ccache is ABI dependent |