| 1 |
mgorny 11/11/27 09:57:20 |
| 2 |
|
| 3 |
Modified: autotools-utils.eclass ChangeLog |
| 4 |
Log: |
| 5 |
Revert making pushd/popd fatal due to humongous breakage. Add a warning message instead. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.29 eclass/autotools-utils.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.29&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.29&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.28&r2=1.29 |
| 13 |
|
| 14 |
Index: autotools-utils.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v |
| 17 |
retrieving revision 1.28 |
| 18 |
retrieving revision 1.29 |
| 19 |
diff -u -r1.28 -r1.29 |
| 20 |
--- autotools-utils.eclass 27 Nov 2011 09:17:35 -0000 1.28 |
| 21 |
+++ autotools-utils.eclass 27 Nov 2011 09:57:20 -0000 1.29 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2011 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.28 2011/11/27 09:17:35 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.29 2011/11/27 09:57:20 mgorny Exp $ |
| 27 |
|
| 28 |
# @ECLASS: autotools-utils.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -205,6 +205,15 @@ |
| 31 |
rm -f "${f}" || die |
| 32 |
fi |
| 33 |
done |
| 34 |
+ |
| 35 |
+ # check for invalid eclass use |
| 36 |
+ # this is the most commonly used function, so do it here |
| 37 |
+ _check_build_dir |
| 38 |
+ if [[ ! -d "${AUTOTOOLS_BUILD_DIR}" ]]; then |
| 39 |
+ eqawarn "autotools-utils used but autotools-utils_src_configure was never called." |
| 40 |
+ eqawarn "This is not supported and never was. Please report a bug against" |
| 41 |
+ eqawarn "the offending ebuild. This will become a fatal error in a near future." |
| 42 |
+ fi |
| 43 |
} |
| 44 |
|
| 45 |
# @FUNCTION: autotools-utils_src_prepare |
| 46 |
@@ -250,9 +259,9 @@ |
| 47 |
|
| 48 |
_check_build_dir |
| 49 |
mkdir -p "${AUTOTOOLS_BUILD_DIR}" || die "mkdir '${AUTOTOOLS_BUILD_DIR}' failed" |
| 50 |
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die |
| 51 |
+ pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null |
| 52 |
base_src_configure "${econfargs[@]}" "$@" |
| 53 |
- popd > /dev/null || die |
| 54 |
+ popd > /dev/null |
| 55 |
} |
| 56 |
|
| 57 |
# @FUNCTION: autotools-utils_src_compile |
| 58 |
@@ -262,9 +271,9 @@ |
| 59 |
debug-print-function ${FUNCNAME} "$@" |
| 60 |
|
| 61 |
_check_build_dir |
| 62 |
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die |
| 63 |
+ pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null |
| 64 |
base_src_compile "$@" |
| 65 |
- popd > /dev/null || die |
| 66 |
+ popd > /dev/null |
| 67 |
} |
| 68 |
|
| 69 |
# @FUNCTION: autotools-utils_src_install |
| 70 |
@@ -279,9 +288,9 @@ |
| 71 |
debug-print-function ${FUNCNAME} "$@" |
| 72 |
|
| 73 |
_check_build_dir |
| 74 |
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die |
| 75 |
+ pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null |
| 76 |
base_src_install "$@" |
| 77 |
- popd > /dev/null || die |
| 78 |
+ popd > /dev/null |
| 79 |
|
| 80 |
# Remove libtool files and unnecessary static libs |
| 81 |
remove_libtool_files |
| 82 |
@@ -294,8 +303,8 @@ |
| 83 |
debug-print-function ${FUNCNAME} "$@" |
| 84 |
|
| 85 |
_check_build_dir |
| 86 |
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die |
| 87 |
+ pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null |
| 88 |
# Run default src_test as defined in ebuild.sh |
| 89 |
default_src_test |
| 90 |
- popd > /dev/null || die |
| 91 |
+ popd > /dev/null |
| 92 |
} |
| 93 |
|
| 94 |
|
| 95 |
|
| 96 |
1.30 eclass/ChangeLog |
| 97 |
|
| 98 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.30&view=markup |
| 99 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.30&content-type=text/plain |
| 100 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.29&r2=1.30 |
| 101 |
|
| 102 |
Index: ChangeLog |
| 103 |
=================================================================== |
| 104 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 105 |
retrieving revision 1.29 |
| 106 |
retrieving revision 1.30 |
| 107 |
diff -u -r1.29 -r1.30 |
| 108 |
--- ChangeLog 27 Nov 2011 09:17:35 -0000 1.29 |
| 109 |
+++ ChangeLog 27 Nov 2011 09:57:20 -0000 1.30 |
| 110 |
@@ -1,6 +1,10 @@ |
| 111 |
# ChangeLog for eclass directory |
| 112 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 113 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.29 2011/11/27 09:17:35 mgorny Exp $ |
| 114 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.30 2011/11/27 09:57:20 mgorny Exp $ |
| 115 |
+ |
| 116 |
+ 27 Nov 2011; Michał Górny <mgorny@g.o> autotools-utils.eclass: |
| 117 |
+ Revert making pushd/popd fatal due to humongous breakage. Add a warning |
| 118 |
+ message instead. |
| 119 |
|
| 120 |
27 Nov 2011; Michał Górny <mgorny@g.o> autotools-utils.eclass: |
| 121 |
Denote that autotools-utils must not be mixed with econf/emake. |
Archives