diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-07-04 08:14:30 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-07-04 08:14:30 +0000 |
| commit | 8a1d752669b22c0ebeeb4d24f47b5a3a1322dea8 (patch) | |
| tree | 1d2833b1b7fe8d1a029b22ed6326d3eaa15d50b8 | |
| parent | abort if binaries have null RPATHs (diff) | |
| download | portage-cvs-8a1d752669b22c0ebeeb4d24f47b5a3a1322dea8.tar.gz portage-cvs-8a1d752669b22c0ebeeb4d24f47b5a3a1322dea8.tar.bz2 portage-cvs-8a1d752669b22c0ebeeb4d24f47b5a3a1322dea8.zip | |
fix gnuconfig find expression #93363
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | bin/ebuild-functions.sh | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -1,12 +1,16 @@ # ChangeLog for Portage; the Gentoo Linux ports system # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Id: ChangeLog,v 1.992 2005/06/23 23:49:53 vapier Exp $ +# $Id: ChangeLog,v 1.993 2005/07/04 08:14:30 vapier Exp $ MAJOR CHANGES in 2.0.51: 1. /var/cache/edb/virtuals is no longer used at all. It's calculated now. 2. /var/cache/edb/world is now /var/lib/portage/world. 3. /etc/portage/profile/virtuals is _USER_ configs only. + 04 Jul 2005; Mike Frysinger <vapier@gentoo.org> + bin/ebuild-default-functions.sh: + Fix gnuconfig find expression #93363 by TGL. + 23 Jun 2005; Mike Frysinger <vapier@gentoo.org> bin/ebuild-default-functions.sh: Update the scanelf RUNPATH check to abort on null paths. diff --git a/bin/ebuild-functions.sh b/bin/ebuild-functions.sh index 5ef3f38..89211e2 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-2005 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.11 2005/05/22 10:44:44 vapier Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild-functions.sh,v 1.12 2005/07/04 08:14:30 vapier Exp $ use() { if useq ${1}; then @@ -75,7 +75,7 @@ econf() { if [ -x "${ECONF_SOURCE}/configure" ]; then if [ -e /usr/share/gnuconfig/ ]; then local x - for x in $(find "${WORKDIR}" -type f -name config.guess -o -name config.sub) ; do + 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}" chmod a+x "${x}" |