diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-12-03 12:05:51 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-12-03 12:05:51 +0000 |
| commit | 62109cd0ad33185e6687e4c85ded447d17de309e (patch) | |
| tree | 1b01fbc87b7e3f0fdd8a1496009dc3cf4784fbf3 | |
| parent | Migrate to BUILD_DIR. This subshelling thing is so hacky the compatibility co... (diff) | |
| download | historical-62109cd0ad33185e6687e4c85ded447d17de309e.tar.gz historical-62109cd0ad33185e6687e4c85ded447d17de309e.tar.bz2 historical-62109cd0ad33185e6687e4c85ded447d17de309e.zip | |
Improve the compatibility code thanks to Arfrever.
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/autotools-utils.eclass | 9 | ||||
| -rw-r--r-- | eclass/cmake-utils.eclass | 9 |
3 files changed, 15 insertions, 9 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 2e3a901f31b8..6d2f2a6d1dd3 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.542 2012/12/03 09:29:09 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.543 2012/12/03 12:05:51 mgorny Exp $ + + 03 Dec 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass, + cmake-utils.eclass: + Improve the compatibility code thanks to Arfrever. 03 Dec 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass, cmake-utils.eclass: diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass index 3bdb9abe1a73..7bdc5d6db999 100644 --- a/eclass/autotools-utils.eclass +++ b/eclass/autotools-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.59 2012/12/03 09:29:09 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.60 2012/12/03 12:05:51 mgorny Exp $ # @ECLASS: autotools-utils.eclass # @MAINTAINER: @@ -198,11 +198,12 @@ _check_build_dir() { # 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} + BUILD_DIR=${AUTOTOOLS_BUILD_DIR:-${WORKDIR}/${P}_build} + else + : ${BUILD_DIR:=${WORKDIR}/${P}_build} fi - - : ${BUILD_DIR:=${WORKDIR}/${P}_build} fi # Backwards compatibility for getting the value. diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 453d4acd4c24..c4baa23035cf 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.88 2012/12/03 10:33:50 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.89 2012/12/03 12:05:51 mgorny Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -178,11 +178,12 @@ _check_build_dir() { # and we'd have to know which one takes precedence. _RESPECT_CMAKE_BUILD_DIR=1 fi + if [[ ${_RESPECT_CMAKE_BUILD_DIR} ]]; then - BUILD_DIR=${CMAKE_BUILD_DIR} + BUILD_DIR=${CMAKE_BUILD_DIR:-${WORKDIR}/${P}_build} + else + : ${BUILD_DIR:=${WORKDIR}/${P}_build} fi - - : ${BUILD_DIR:=${WORKDIR}/${P}_build} fi # Backwards compatibility for getting the value. |