diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-11-24 10:53:13 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-11-24 10:53:13 +0000 |
| commit | 44dd1a621828fdceb4faefc7d3d578c2e671a002 (patch) | |
| tree | 4639052a6c277c5954b16aaf6f277e137d30173c /eclass | |
| parent | Fix Changelog (diff) | |
| download | gentoo-2-44dd1a621828fdceb4faefc7d3d578c2e671a002.tar.gz gentoo-2-44dd1a621828fdceb4faefc7d3d578c2e671a002.tar.bz2 gentoo-2-44dd1a621828fdceb4faefc7d3d578c2e671a002.zip | |
Respect BUILD_DIR in in-source builds when set earlier.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/autotools-utils.eclass | 32 |
2 files changed, 20 insertions, 17 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 057ce54ac856..86d36e93a80f 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1065 2013/11/24 10:25:52 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1066 2013/11/24 10:53:13 mgorny Exp $ + + 24 Nov 2013; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass: + Respect BUILD_DIR in in-source builds when set earlier. 24 Nov 2013; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass: Reuse multilib-minimal to reduce code duplication and allow easier function diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass index 5d7549f3e26d..efc6fbcff852 100644 --- a/eclass/autotools-utils.eclass +++ b/eclass/autotools-utils.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/autotools-utils.eclass,v 1.71 2013/10/08 10:34:45 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.72 2013/11/24 10:53:13 mgorny Exp $ # @ECLASS: autotools-utils.eclass # @MAINTAINER: @@ -191,22 +191,22 @@ EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test # Determine using IN or OUT source build _check_build_dir() { : ${ECONF_SOURCE:=${S}} - if [[ -n ${AUTOTOOLS_IN_SOURCE_BUILD} ]]; then - BUILD_DIR="${ECONF_SOURCE}" - else - # Respect both the old variable and the new one, depending - # on which one was set by the ebuild. - if [[ ! ${BUILD_DIR} && ${AUTOTOOLS_BUILD_DIR} ]]; then - eqawarn "The AUTOTOOLS_BUILD_DIR variable has been renamed to BUILD_DIR." - eqawarn "Please migrate the ebuild to use the new one." - - # In the next call, both variables will be set already - # and we'd have to know which one takes precedence. - _RESPECT_AUTOTOOLS_BUILD_DIR=1 - fi + # Respect both the old variable and the new one, depending + # on which one was set by the ebuild. + if [[ ! ${BUILD_DIR} && ${AUTOTOOLS_BUILD_DIR} ]]; then + eqawarn "The AUTOTOOLS_BUILD_DIR variable has been renamed to BUILD_DIR." + eqawarn "Please migrate the ebuild to use the new one." + + # In the next call, both variables will be set already + # and we'd have to know which one takes precedence. + _RESPECT_AUTOTOOLS_BUILD_DIR=1 + fi - if [[ ${_RESPECT_AUTOTOOLS_BUILD_DIR} ]]; then - BUILD_DIR=${AUTOTOOLS_BUILD_DIR:-${WORKDIR}/${P}_build} + if [[ ${_RESPECT_AUTOTOOLS_BUILD_DIR} ]]; then + BUILD_DIR=${AUTOTOOLS_BUILD_DIR:-${WORKDIR}/${P}_build} + else + if [[ -n ${AUTOTOOLS_IN_SOURCE_BUILD} ]]; then + : ${BUILD_DIR:=${ECONF_SOURCE}} else : ${BUILD_DIR:=${WORKDIR}/${P}_build} fi |