| 1 |
autotools-utils is now capable of autoreconfiguring packages, and the |
| 2 |
patch-trigger may cause packages to be reconfigured twice. After the |
| 3 |
update, xorg-2 will just trigger autoreconf in autotools-utils rather |
| 4 |
than repeating it. |
| 5 |
--- |
| 6 |
xorg-2.eclass | 10 ++++++---- |
| 7 |
1 files changed, 6 insertions(+), 4 deletions(-) |
| 8 |
|
| 9 |
diff --git a/xorg-2.eclass b/xorg-2.eclass |
| 10 |
index b678b24..a4e161a 100644 |
| 11 |
--- a/xorg-2.eclass |
| 12 |
+++ b/xorg-2.eclass |
| 13 |
@@ -37,7 +37,7 @@ if [[ ${PN} == font* \ |
| 14 |
FONT_ECLASS="font" |
| 15 |
fi |
| 16 |
|
| 17 |
-inherit autotools-utils eutils libtool multilib toolchain-funcs flag-o-matic autotools \ |
| 18 |
+inherit autotools-utils eutils libtool multilib toolchain-funcs flag-o-matic \ |
| 19 |
${FONT_ECLASS} ${GIT_ECLASS} |
| 20 |
|
| 21 |
EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm" |
| 22 |
@@ -313,7 +313,6 @@ xorg-2_patch_source() { |
| 23 |
EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} |
| 24 |
|
| 25 |
[[ -d "${EPATCH_SOURCE}" ]] && epatch |
| 26 |
- autotools-utils_src_prepare "$@" |
| 27 |
} |
| 28 |
|
| 29 |
# @FUNCTION: xorg-2_reconf_source |
| 30 |
@@ -325,11 +324,13 @@ xorg-2_reconf_source() { |
| 31 |
case ${CHOST} in |
| 32 |
*-interix* | *-aix* | *-winnt*) |
| 33 |
# some hosts need full eautoreconf |
| 34 |
- [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail." |
| 35 |
+ [[ -e "./configure.ac" || -e "./configure.in" ]] \ |
| 36 |
+ && AUTOTOOLS_AUTORECONF=1 |
| 37 |
;; |
| 38 |
*) |
| 39 |
# elibtoolize required for BSD |
| 40 |
- [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] && eautoreconf || elibtoolize |
| 41 |
+ [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] \ |
| 42 |
+ && AUTOTOOLS_AUTORECONF=1 |
| 43 |
;; |
| 44 |
esac |
| 45 |
} |
| 46 |
@@ -342,6 +343,7 @@ xorg-2_src_prepare() { |
| 47 |
|
| 48 |
xorg-2_patch_source |
| 49 |
xorg-2_reconf_source |
| 50 |
+ autotools-utils_src_prepare "$@" |
| 51 |
} |
| 52 |
|
| 53 |
# @FUNCTION: xorg-2_font_configure |
| 54 |
-- |
| 55 |
1.7.8.3 |
Archives