summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul de Vrieze <pauldv@gentoo.org>2004-08-23 12:38:34 +0000
committerPaul de Vrieze <pauldv@gentoo.org>2004-08-23 12:38:34 +0000
commitc514056fabae8f0cdbd1e84b570bd79e9c250759 (patch)
treedec59992d4fdd2d0d493acc70523ac5877f66c31
parentAdded a patch to let user specify the value of internalBorder. (Manifest reco... (diff)
downloadgentoo-2-c514056fabae8f0cdbd1e84b570bd79e9c250759.tar.gz
gentoo-2-c514056fabae8f0cdbd1e84b570bd79e9c250759.tar.bz2
gentoo-2-c514056fabae8f0cdbd1e84b570bd79e9c250759.zip
Change the cleanup routine, cleaning out all symlinks that maintain multi-slot ability. They are autogenerated, and having them in the contents creates problems (bug #60732)
-rw-r--r--eclass/db.eclass31
1 files changed, 13 insertions, 18 deletions
diff --git a/eclass/db.eclass b/eclass/db.eclass
index a8d23eb9b728..39e61f509e7c 100644
--- a/eclass/db.eclass
+++ b/eclass/db.eclass
@@ -1,27 +1,12 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.9 2004/08/23 11:52:10 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.10 2004/08/23 12:38:34 pauldv Exp $
# This is a common location for functions used in the sys-libs/db ebuilds
ECLASS=db
INHERITED="$INHERITED $ECLASS"
EXPORT_FUNCTIONS db_fix_so db_src_install_doc db_src_install_usrbinslot db_src_install_headerslot db_src_install_usrlibcleanup
-clean_links () {
- # Clean out the symlinks so that they will not be recorded in the
- # contents (bug #60732)
-
- if [ "${D}" = "" ]; then
- die "Calling clean_links while \$D not defined"
- fi
-
- find ${D}/usr/lib -maxdepth 1 -type l -name 'libdb[1._-]*so' -exec rm \{} \;
- find ${D}/usr/lib -maxdepth 1 -type l -name 'libdb[1._-]*so.[23]' -exec rm \{} \;
- find ${D}/usr/lib -maxdepth 1 -type l -name 'libdb[1._-]*a' -exec rm \{} \;
-
- rm ${D}/usr/include/db.h ${D}/usr/include/db_185.h
-}
-
db_fix_so () {
cd ${ROOT}/usr/lib
@@ -90,6 +75,16 @@ db_src_install_headerslot() {
}
db_src_install_usrlibcleanup() {
- # this actually does all the work for us, so let's reduce code duplication
- ROOT=${D} db_fix_so
+ # Clean out the symlinks so that they will not be recorded in the
+ # contents (bug #60732)
+
+ if [ "${D}" = "" ]; then
+ die "Calling clean_links while \$D not defined"
+ fi
+
+ find ${D}/usr/lib -maxdepth 1 -type l -name 'libdb[1._-]*so' -exec rm \{} \;
+ find ${D}/usr/lib -maxdepth 1 -type l -name 'libdb[1._-]*so.[23]' -exec rm \{} \;
+ find ${D}/usr/lib -maxdepth 1 -type l -name 'libdb[1._-]*a' -exec rm \{} \;
+
+ rm ${D}/usr/include/db.h ${D}/usr/include/db_185.h
}