diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-04-26 01:19:16 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-04-26 01:19:16 +0000 |
| commit | b8d1b5effcc7eac360a1748c27a860ccc39a4aa2 (patch) | |
| tree | 1b8c8afa040dd5707d49aff5e4872c385a73efdc /bin | |
| parent | no more -* explanations (diff) | |
| download | portage-cvs-b8d1b5effcc7eac360a1748c27a860ccc39a4aa2.tar.gz portage-cvs-b8d1b5effcc7eac360a1748c27a860ccc39a4aa2.tar.bz2 portage-cvs-b8d1b5effcc7eac360a1748c27a860ccc39a4aa2.zip | |
make config.{sub,guess} (FEATURES=autoconfig) always be replaced #81822
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild-functions.sh | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/bin/ebuild-functions.sh b/bin/ebuild-functions.sh index f879ade..1cd1e61 100755 --- a/bin/ebuild-functions.sh +++ b/bin/ebuild-functions.sh @@ -2,7 +2,7 @@ # ebuild-functions.sh; ebuild env functions, saved with the ebuild (not specific to the portage version). # Copyright 2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -$Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild-functions.sh,v 1.8 2005/03/29 00:22:28 ferringb Exp $ +$Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild-functions.sh,v 1.9 2005/04/26 01:19:16 vapier Exp $ use() { if useq ${1}; then @@ -73,15 +73,14 @@ econf() { local ret ECONF_SOURCE="${ECONF_SOURCE:-.}" if [ -x "${ECONF_SOURCE}/configure" ]; then - if hasq autoconfig $FEATURES && ! hasq autoconfig $RESTRICT; then - if [ -e /usr/share/gnuconfig/ ]; then - local x - for x in $(find ${WORKDIR} -type f -name config.guess -o -name config.sub); do - echo " * econf: updating ${x/${WORKDIR}\/} with /usr/share/gnuconfig/${x##*/}" - cp -f "/usr/share/gnuconfig/${x##*/}" "${x}" - done - fi + if [ -e /usr/share/gnuconfig/ ]; then + local x + for x in $(find "${WORKDIR}" -type f -name config.guess -o -name config.sub) ; do + echo " * econf: updating ${x/${WORKDIR}\/} with /usr/share/gnuconfig/${x##*/}" + cp -f "/usr/share/gnuconfig/${x##*/}" "${x}" + done fi + if [ ! -z "${CBUILD}" ]; then EXTRA_ECONF="--build=${CBUILD} ${EXTRA_ECONF}" fi |