autotools-utils is now capable of autoreconfiguring packages, and the
patch-trigger may cause packages to be reconfigured twice. After the
update, xorg-2 will just trigger autoreconf in autotools-utils rather
than repeating it.
---
xorg-2.eclass | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/xorg-2.eclass b/xorg-2.eclass
index b678b24..a4e161a 100644
--- a/xorg-2.eclass
+++ b/xorg-2.eclass
@@ -37,7 +37,7 @@ if [[ ${PN} == font* \
FONT_ECLASS="font"
fi
-inherit autotools-utils eutils libtool multilib toolchain-funcs flag-o-matic
autotools \
+inherit autotools-utils eutils libtool multilib toolchain-funcs flag-o-matic \
${FONT_ECLASS} ${GIT_ECLASS}
EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
@@ -313,7 +313,6 @@ xorg-2_patch_source() {
EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
[[ -d "${EPATCH_SOURCE}" ]] && epatch
- autotools-utils_src_prepare "$@"
}
# @FUNCTION: xorg-2_reconf_source
@@ -325,11 +324,13 @@ xorg-2_reconf_source() {
case ${CHOST} in
*-interix* | *-aix* | *-winnt*)
# some hosts need full eautoreconf
- [[ -e "./configure.ac" || -e "./configure.in" ]] &&
eautoreconf || ewarn "Unable to autoreconf the configure script. Things may
fail."
+ [[ -e "./configure.ac" || -e "./configure.in" ]] \
+ && AUTOTOOLS_AUTORECONF=1
;;
*)
# elibtoolize required for BSD
- [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac"
|| -e "./configure.in" ) ]] && eautoreconf || elibtoolize
+ [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac"
|| -e "./configure.in" ) ]] \
+ && AUTOTOOLS_AUTORECONF=1
;;
esac
}
@@ -342,6 +343,7 @@ xorg-2_src_prepare() {
xorg-2_patch_source
xorg-2_reconf_source
+ autotools-utils_src_prepare "$@"
}
# @FUNCTION: xorg-2_font_configure
--
1.7.8.3
