diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | bin/emake | 6 | ||||
| -rwxr-xr-x | bin/prepstrip | 16 |
3 files changed, 19 insertions, 9 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.969 2005/05/04 23:14:40 vapier Exp $ +# $Id: ChangeLog,v 1.970 2005/05/04 23:17:54 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 May 2005; Mike Frysinger <vapier@gentoo.org> bin/prepstrip bin/emake: + Only echo the strip banner once per dir and don't try to pass strip args + to `false` if we aren't stripping. Add a simple 'exec' to emake. + 04 May 2005; Mike Frysinger <vapier@gentoo.org> bin/{do,new}{env,conf,init}d: Touch up and simplify. @@ -1,7 +1,7 @@ #!/bin/bash -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-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/emake,v 1.9 2004/10/04 13:56:50 vapier Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/emake,v 1.10 2005/05/04 23:17:54 vapier Exp $ # # emake: Supplies some default parameters to GNU make. At the moment the # only parameter supplied is -jN, where N is a number of @@ -11,4 +11,4 @@ # /etc/make.globals here because emake is only called from an # ebuild. -make ${MAKEOPTS} ${EXTRA_EMAKE} "$@" +exec make ${MAKEOPTS} ${EXTRA_EMAKE} "$@" diff --git a/bin/prepstrip b/bin/prepstrip index caacef9..893c50c 100755 --- a/bin/prepstrip +++ b/bin/prepstrip @@ -1,19 +1,20 @@ #!/bin/bash -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-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/prepstrip,v 1.25 2004/12/06 03:04:31 carpaski Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/prepstrip,v 1.26 2005/05/04 23:17:54 vapier Exp $ if [ "${FEATURES//*nostrip*/true}" == "true" ] || [ "${RESTRICT//*nostrip*/true}" == "true" ] ; then echo "nostrip" STRIP="/bin/false" + PORTAGE_STRIP_FLAGS="" else STRIP="${STRIP:-${CHOST}-strip}" type -p ${STRIP} > /dev/null || STRIP=strip -fi -PORTAGE_STRIP_FLAGS="${PORTAGE_STRIP_FLAGS:---strip-unneeded}" + PORTAGE_STRIP_FLAGS=${PORTAGE_STRIP_FLAGS:---strip-unneeded} +fi -echo "strip: ${PORTAGE_STRIP_FLAGS}" +banner=1 retval=0 for x in "$@" ; do @@ -22,6 +23,11 @@ for x in "$@" ; do find "${x}" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 -or -name '*.so' -or -name '*.so.*' \) -print0 | $XARGS -0 -n500 prepstrip else + if [ ${banner} -eq 1 ] ; then + echo "strip: ${STRIP} ${PORTAGE_STRIP_FLAGS}" + banner=0 + fi + f=$(file "${x}") if [ -z "${f/*current ar archive*/}" ]; then echo " ${x:${#D}:${#x}}" |