diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-03-02 07:13:32 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-03-02 07:13:32 +0000 |
| commit | 170cbd257aa4a967576cf58e380db9d8ae552e71 (patch) | |
| tree | ef6605eda71fb2edf56eeadbd5f76d62ab86797a /eclass | |
| parent | Version bump. (diff) | |
| download | historical-170cbd257aa4a967576cf58e380db9d8ae552e71.tar.gz historical-170cbd257aa4a967576cf58e380db9d8ae552e71.tar.bz2 historical-170cbd257aa4a967576cf58e380db9d8ae552e71.zip | |
In-source builds: append "build/" subdir to the BUILD_DIR variable. It can be used alike in out-of-source builds now.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/distutils-r1.eclass | 13 |
2 files changed, 10 insertions, 9 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 9c09f7ee0ee6..9a971b9155b5 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.695 2013/02/27 23:23:11 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.696 2013/03/02 07:13:32 mgorny Exp $ + + 02 Mar 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass: + In-source builds: append "build/" subdir to the BUILD_DIR variable. It can be + used alike in out-of-source builds now. 27 Feb 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: Enable x32 ABI support. diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 4db8392ce391..4b061ae36ed2 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.57 2013/02/27 21:02:59 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.58 2013/03/02 07:13:32 mgorny Exp $ # @ECLASS: distutils-r1 # @MAINTAINER: @@ -285,11 +285,6 @@ distutils_install_for_testing() { # 5) 'install' needs to go before 'bdist_egg' or the latter would # re-set install paths. - if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then - # use 'build' subdirectory to reduce the risk of collisions - local BUILD_DIR=${BUILD_DIR}/build - fi - TEST_DIR=${BUILD_DIR}/test local bindir=${TEST_DIR}/scripts local libdir=${TEST_DIR}/lib @@ -540,8 +535,9 @@ distutils-r1_python_install_all() { # directory, with BUILD_DIR pointing at the build directory # and PYTHONPATH having an entry for the module build directory. # -# If in-source builds are used, the command is executed in the BUILD_DIR -# (the directory holding per-implementation copy of sources). +# If in-source builds are used, the command is executed in the directory +# holding the per-implementation copy of sources. BUILD_DIR points +# to the 'build' subdirectory. distutils-r1_run_phase() { debug-print-function ${FUNCNAME} "${@}" @@ -549,6 +545,7 @@ distutils-r1_run_phase() { if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then pushd "${BUILD_DIR}" >/dev/null || die fi + local BUILD_DIR=${BUILD_DIR}/build else local PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}" export PYTHONPATH |