diff options
| author |   Steven J Newbury <steve@snewbury.org.uk> | 2009-04-12 16:39:49 +0100 |
|---|---|---|
| committer | Steven J Newbury <steve@snewbury.org.uk> | 2009-04-12 16:39:49 +0100 |
| commit | ee991c6a1876898b19488b152c8bb53e3faf93fd (patch) | |
| tree | 686de96183e5f487cf9690afcf88d4a2789a0da6 /doc | |
| parent | Improve some debug messages, and put one back in the right place after (diff) | |
| download | multilib-portage-ee991c6a1876898b19488b152c8bb53e3faf93fd.tar.gz multilib-portage-ee991c6a1876898b19488b152c8bb53e3faf93fd.tar.bz2 multilib-portage-ee991c6a1876898b19488b152c8bb53e3faf93fd.zip | |
Fix CMAKE build. There were a couple of typos
(s/mymakeargs/mycmakeargs), a test inverted, and the
CMAKE_BUILD_DIR wasn't being saved and restored.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/experimental/multilib-native.eclass | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/doc/experimental/multilib-native.eclass b/doc/experimental/multilib-native.eclass index 294666cae..ab767946e 100644 --- a/doc/experimental/multilib-native.eclass +++ b/doc/experimental/multilib-native.eclass @@ -88,6 +88,7 @@ declare -a EMULTILIB_LDFLAGS declare -a EMULTILIB_CHOST declare -a EMULTILIB_S declare -a EMULTILIB_KDE_S +declare -a EMULTILIB_CMAKE_BUILD_DIR declare -a EMULTILIB_CCACHE_DIR declare -a EMULTILIB_myconf declare -a EMULTILIB_mycmakeargs @@ -230,7 +231,7 @@ _setup_multilib_platform_env() { else QMAKESPEC="linux-g++" fi - if [[ ${ABI} == ${DEFAULT_ABI} ]]; then + if [[ ! ${ABI} == ${DEFAULT_ABI} ]]; then if [[ -n "${EMULTILIB_LIB_SUFFIX[${EMULTILIB_ARRAY_INDEX}]}" ]]; then QTBINDIR="/usr/libexec/qt/${EMULTILIB_LIB_SUFFIX[${EMULTILIB_ARRAY_INDEX}]}" QMAKESPEC="linux-g++-${EMULTILIB_LIB_SUFFIX[${EMULTILIB_ARRAY_INDEX}]}" @@ -245,9 +246,12 @@ _setup_multilib_platform_env() { QTBINDIR="/usr/bin" fi + multilib_debug QMAKESPEC "${QMAKESPEC}" + # Multilib CMake Support - needs the qmake from QT above mycmakeargs="${mycmakeargs} \ -DQT_QMAKE_EXECUTABLE:FILEPATH=${QTBINDIR}/qmake" + multilib_debug mycmakeargs "${mycmakeargs}" # ccache if [[ -z ${CCACHE_DIR} ]] ; then @@ -289,9 +293,10 @@ _save_multilib_platform_env() { EMULTILIB_CHOST[${EMULTILIB_ARRAY_INDEX}]="${CHOST}" EMULTILIB_S[${EMULTILIB_ARRAY_INDEX}]="${S}" EMULTILIB_KDE_S[${EMULTILIB_ARRAY_INDEX}]="${KDE_S}" + EMULTILIB_KDE_CMAKE_BUILD_DIR[${EMULTILIB_ARRAY_INDEX}]="${CMAKE_BUILD_DIR}" EMULTILIB_CCACHE_DIR[${EMULTILIB_ARRAY_INDEX}]="${CCACHE_DIR}" EMULTILIB_myconf[${EMULTILIB_ARRAY_INDEX}]="${myconf}" - EMULTILIB_mycmakeargs[${EMULTILIB_ARRAY_INDEX}]="${mymakeargs}" + EMULTILIB_mycmakeargs[${EMULTILIB_ARRAY_INDEX}]="${mycmakeargs}" # Non-default ABI binaries EMULTILIB_PYTHON[${EMULTILIB_ARRAY_INDEX}]="${PYTHON}" @@ -322,9 +327,10 @@ _restore_multilib_platform_env() { CHOST="${EMULTILIB_CHOST[${EMULTILIB_ARRAY_INDEX}]}" S="${EMULTILIB_S[${EMULTILIB_ARRAY_INDEX}]}" KDE_S="${EMULTILIB_KDE_S[${EMULTILIB_ARRAY_INDEX}]}" + CMAKE_BUILD_DIR="${EMULTILIB_CMAKE_BUILD_DIR[${EMULTILIB_ARRAY_INDEX}]}" CCACHE_DIR="${EMULTILIB_CCACHE_DIR[${EMULTILIB_ARRAY_INDEX}]}" myconf="${EMULTILIB_myconf[${EMULTILIB_ARRAY_INDEX}]}" - mymakeargs="${EMULTILIB_mycmakeargs[${EMULTILIB_ARRAY_INDEX}]}" + mycmakeargs="${EMULTILIB_mycmakeargs[${EMULTILIB_ARRAY_INDEX}]}" # Non-default ABI binaries PYTHON="${EMULTILIB_PYTHON[${EMULTILIB_ARRAY_INDEX}]}" |