diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-03-09 15:25:36 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-03-09 15:25:36 +0000 |
| commit | 166c7fe7b5657c939bcb2d95cecada7fc6e59278 (patch) | |
| tree | 755bd22e88517af26757b948a2f7f4a418263599 /eclass | |
| parent | removing deprecated bluez modules mask, adding qce-ga mask (diff) | |
| download | historical-166c7fe7b5657c939bcb2d95cecada7fc6e59278.tar.gz historical-166c7fe7b5657c939bcb2d95cecada7fc6e59278.tar.bz2 historical-166c7fe7b5657c939bcb2d95cecada7fc6e59278.zip | |
Fix prerm logic to not uninstall the binutils profile every second merge for the same arch
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain-binutils.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass index 6ac47bf3187a..f9113fd887e7 100644 --- a/eclass/toolchain-binutils.eclass +++ b/eclass/toolchain-binutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.25 2005/02/19 21:36:27 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.26 2005/03/09 15:25:36 azarah Exp $ # We install binutils into CTARGET-VERSION specific directories. This lets # us easily merge multiple versions for multiple targets (if we wish) and @@ -218,7 +218,7 @@ toolchain-binutils_pkg_postinst() { binutils-config ${CTARGET}-${PV} } -toolchain-binutils_pkg_prerm() { +toolchain-binutils_pkg_postrm() { local curr=$(env CHOST=${CTARGET} binutils-config -c) [[ ${curr} != ${CTARGET}-${PV} ]] && return 0 @@ -229,9 +229,9 @@ toolchain-binutils_pkg_prerm() { # If no other versions exist, then uninstall for this # target ... otherwise, switch to the newest version - if [[ -z ${choice} ]] ; then + if [[ ! -f ${BINPATH}/ld && -z ${choice} ]] ; then binutils-config -u ${CTARGET} - else + elif [[ -n ${choice} ]] ; then binutils-config ${choice} fi } |