diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-05-28 07:45:19 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-05-28 07:45:19 +0000 |
| commit | d6665478f7f1aea976d120c62366271c465cb796 (patch) | |
| tree | 6a14f268cbb6e7f19ce4dde8ca9817aeabf228b0 /eclass/autotools-utils.eclass | |
| parent | Fix wxwidgets handling, thanks to papillon81 (diff) | |
| download | historical-d6665478f7f1aea976d120c62366271c465cb796.tar.gz historical-d6665478f7f1aea976d120c62366271c465cb796.tar.bz2 historical-d6665478f7f1aea976d120c62366271c465cb796.zip | |
Fail whenever unable to change directory, wrt #391927.
Diffstat (limited to 'eclass/autotools-utils.eclass')
| -rw-r--r-- | eclass/autotools-utils.eclass | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass index b17a15bbec3e..c8251dbe8f82 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.51 2012/05/28 07:34:43 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.52 2012/05/28 07:45:19 mgorny Exp $ # @ECLASS: autotools-utils.eclass # @MAINTAINER: @@ -337,9 +337,9 @@ autotools-utils_autoreconf() { local x for x in $(autotools_check_macro_val AC_CONFIG_SUBDIRS); do if [[ -d ${x} ]] ; then - pushd "${x}" >/dev/null + pushd "${x}" >/dev/null || die autotools-utils_autoreconf - popd >/dev/null + popd >/dev/null || die fi done } @@ -415,9 +415,9 @@ autotools-utils_src_configure() { econfargs+=("${myeconfargs[@]}") mkdir -p "${AUTOTOOLS_BUILD_DIR}" || die "mkdir '${AUTOTOOLS_BUILD_DIR}' failed" - pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null + pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die econf "${econfargs[@]}" "$@" - popd > /dev/null + popd > /dev/null || die } # @FUNCTION: autotools-utils_src_compile @@ -427,9 +427,9 @@ autotools-utils_src_compile() { debug-print-function ${FUNCNAME} "$@" _check_build_dir - pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null + pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die emake "$@" || die 'emake failed' - popd > /dev/null + popd > /dev/null || die } # @FUNCTION: autotools-utils_src_install @@ -444,9 +444,9 @@ autotools-utils_src_install() { debug-print-function ${FUNCNAME} "$@" _check_build_dir - pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null + pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die emake DESTDIR="${D}" "$@" install || die "emake install failed" - popd > /dev/null + popd > /dev/null || die # Move docs installed by autotools (in EAPI < 4). if [[ ${EAPI} == [23] ]] \ @@ -491,8 +491,8 @@ autotools-utils_src_test() { debug-print-function ${FUNCNAME} "$@" _check_build_dir - pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null + pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die # Run default src_test as defined in ebuild.sh default_src_test - popd > /dev/null + popd > /dev/null || die } |