diff options
| author |   Steven J Newbury <steve@snewbury.org.uk> | 2009-04-12 16:11:38 +0100 |
|---|---|---|
| committer | Steven J Newbury <steve@snewbury.org.uk> | 2009-04-12 16:11:38 +0100 |
| commit | d64f40d8033f703e3fff8f6e96641b371b73e342 (patch) | |
| tree | ce5cd1652430898d0f86c14e3a086fc87ec7c76a /doc | |
| parent | Sync sys-libs/db (diff) | |
| download | multilib-portage-d64f40d8033f703e3fff8f6e96641b371b73e342.tar.gz multilib-portage-d64f40d8033f703e3fff8f6e96641b371b73e342.tar.bz2 multilib-portage-d64f40d8033f703e3fff8f6e96641b371b73e342.zip | |
Fix the handling of S, CMAKE_BUILD_DIR and ECONF_SOURCE.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/experimental/multilib-native.eclass | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/doc/experimental/multilib-native.eclass b/doc/experimental/multilib-native.eclass index 31946306b..80d76d3c8 100644 --- a/doc/experimental/multilib-native.eclass +++ b/doc/experimental/multilib-native.eclass @@ -493,23 +493,23 @@ multilib-native_src_generic_sub() { done fi - [[ -z "${MULTILIB_IN_SOURCE_BUILD}" ]] && \ - ECONF_SOURCE="${EMULTILIB_SOURCE_TOPDIR}" - multilib_debug ECONF_SOURCE "${ECONF_SOURCE}" - # S should not be redefined for out-of-source-tree - # prepare phase, or at all in the CMake case + # S should not be redefined for the CMake + # !CMAKE_IN_SOURCE_BUILD case, otherwise + # ECONF_SOURCE should point to the _prepared_ + # source dir and S to the build directory if [[ -n "${CMAKE_BUILD_TYPE}" ]]; then - if [[ -n "${CMAKE_IN_SOURCE_BUILD}" ]]; then - S="${WORKDIR}/${PN}_build_${ABI}/${EMULTILIB_RELATIVE_BUILD_DIR/${EMULTILIB_SOURCE_TOP_DIRNAME}}" - fi + CMAKE_BUILD_DIR="${WORKDIR}/${PN}_build_${ABI}/${EMULTILIB_RELATIVE_BUILD_DIR/${EMULTILIB_SOURCE_TOP_DIRNAME}}" + [[ -n "${CMAKE_IN_SOURCE_BUILD}" ]] && \ + S="${CMAKE_BUILD_DIR}" else - if !([[ "$1" == "src_prepare" ]] && \ - [[ -z "${MULTILIB_IN_SOURCE_BUILD}" ]]); then - S="${WORKDIR}/${PN}_build_${ABI}/${EMULTILIB_RELATIVE_BUILD_DIR/${EMULTILIB_SOURCE_TOP_DIRNAME}}" + S="${WORKDIR}/${PN}_build_${ABI}/${EMULTILIB_RELATIVE_BUILD_DIR/${EMULTILIB_SOURCE_TOP_DIRNAME}}" + if [[ -n ${MULTILIB_IN_SOURCE_BUILD} ]]; then + ECONF_SOURCE="${S}" + else + ECONF_SOURCE="${EMULTILIB_SOURCE_TOPDIR}/${EMULTILIB_RELATIVE_BUILD_DIR/${EMULTILIB_SOURCE_TOP_DIRNAME}}" fi fi - CMAKE_BUILD_DIR="${WORKDIR}/${PN}_build_${ABI}/${EMULTILIB_RELATIVE_BUILD_DIR/${EMULTILIB_SOURCE_TOP_DIRNAME}}" multilib_debug CMAKE_BUILD_DIR "${CMAKE_BUILD_DIR}" KDE_S="${S}" multilib_debug KDE_S "${KDE_S}" @@ -520,6 +520,7 @@ multilib-native_src_generic_sub() { [[ "${ABI}" == "${DEFAULT_ABI}" ]] || \ _export_ml_config_vars "${ABI}" fi + multilib_debug ECONF_SOURCE "${ECONF_SOURCE}" #Nice way to avoid the "cannot run test program while cross compiling" :) CBUILD=$CHOST |