diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-11-05 12:11:55 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-11-05 12:11:55 +0000 |
| commit | bfc2029d80bd6c5ed2e33d51c09b35d12e0782bf (patch) | |
| tree | 7350c1782309a7d1eecd45308f2a75e62bd28098 /eclass | |
| parent | stable x86, bug 343609 (diff) | |
| download | gentoo-2-bfc2029d80bd6c5ed2e33d51c09b35d12e0782bf.tar.gz gentoo-2-bfc2029d80bd6c5ed2e33d51c09b35d12e0782bf.tar.bz2 gentoo-2-bfc2029d80bd6c5ed2e33d51c09b35d12e0782bf.zip | |
Append eautoreconf depstring to archs where it is mandatory to run eautoreconf. (this is required for cache)
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/xorg-2.eclass | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass index c717619f993e..bd47ac865a42 100644 --- a/eclass/xorg-2.eclass +++ b/eclass/xorg-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.18 2010/11/01 12:37:58 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.19 2010/11/05 12:11:55 scarabeus Exp $ # # @ECLASS: xorg-2.eclass # @MAINTAINER: @@ -93,20 +93,26 @@ fi # are under the MIT license. (This is what Red Hat does in their rpms) : ${LICENSE:=MIT} -# Set up shared dependencies -if [[ ${XORG_EAUTORECONF} != no ]]; then - DEPEND+=" - >=sys-devel/libtool-2.2.6a - sys-devel/m4" - # This MUST BE STABLE - if [[ ${PN} != util-macros ]] ; then - DEPEND+=" >=x11-misc/util-macros-1.11.0" - # Required even by xorg-server - [[ ${PN} == "font-util" ]] || DEPEND+=" >=media-fonts/font-util-1.1.1-r1" - fi - WANT_AUTOCONF="latest" - WANT_AUTOMAKE="latest" +# Set up autotools shared dependencies +# Remember that all versions here MUST be stable +XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt" +EAUTORECONF_DEPEND+=" + >=sys-devel/libtool-2.2.6a + sys-devel/m4" +if [[ ${PN} != util-macros ]] ; then + EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.11.0" + # Required even by xorg-server + [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.1.1-r1" fi +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" +for arch in ${XORG_EAUTORECONF_ARCHES}; do + EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )" +done +DEPEND+=" ${EAUTORECONF_DEPENDS}" +[[ ${XORG_EAUTORECONF} != no ]] && DEPEND+=" ${EAUTORECONF_DEPEND}" +unset EAUTORECONF_DEPENDS +unset EAUTORECONF_DEPEND if [[ ${FONT} == yes ]]; then RDEPEND+=" media-fonts/encodings |