| 1 |
Right now, any patch which modifies common autotools source files |
| 2 |
triggers autoreconf. In some cases, this causes the package to be |
| 3 |
reconfigured twice -- once by the eclass, and the second time by the |
| 4 |
ebuild. |
| 5 |
|
| 6 |
To avoid that, trigger autoreconfiguration only when user patches modify |
| 7 |
these files. |
| 8 |
--- |
| 9 |
autotools-utils.eclass | 5 +++-- |
| 10 |
1 files changed, 3 insertions(+), 2 deletions(-) |
| 11 |
|
| 12 |
diff --git a/autotools-utils.eclass b/autotools-utils.eclass |
| 13 |
index 4f54814..559ef0a 100644 |
| 14 |
--- a/autotools-utils.eclass |
| 15 |
+++ b/autotools-utils.eclass |
| 16 |
@@ -359,8 +359,9 @@ autotools-utils_src_prepare() { |
| 17 |
|
| 18 |
local want_autoreconf=${AUTOTOOLS_AUTORECONF} |
| 19 |
|
| 20 |
- touch "${T}"/.autotools-utils.timestamp || die |
| 21 |
[[ ${PATCHES} ]] && epatch "${PATCHES[@]}" |
| 22 |
+ |
| 23 |
+ touch "${T}"/.autotools-utils.timestamp || die |
| 24 |
epatch_user |
| 25 |
if [[ ! ${want_autoreconf} ]]; then |
| 26 |
if [[ $(find . -newer "${T}"/.autotools-utils.timestamp \ |
| 27 |
@@ -368,7 +369,7 @@ autotools-utils_src_prepare() { |
| 28 |
-o -name 'configure.ac' \ |
| 29 |
-o -name 'configure.in' ')' \ |
| 30 |
-print -quit) ]]; then |
| 31 |
- einfo 'Will autoreconfigure due to patches applied.' |
| 32 |
+ einfo 'Will autoreconfigure due to user patches applied.' |
| 33 |
want_autoreconf=yep |
| 34 |
fi |
| 35 |
fi |
| 36 |
-- |
| 37 |
1.7.8.3 |
Archives