diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2010-10-18 17:39:02 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2010-10-18 17:39:02 +0000 |
| commit | 2c02047a6cd77a433a57f6d3c10d9b14c36334d5 (patch) | |
| tree | 97cf7ffceab4085714f89c8f74129b35352b722f /eclass | |
| parent | Remove old. (diff) | |
| download | gentoo-2-2c02047a6cd77a433a57f6d3c10d9b14c36334d5.tar.gz gentoo-2-2c02047a6cd77a433a57f6d3c10d9b14c36334d5.tar.bz2 gentoo-2-2c02047a6cd77a433a57f6d3c10d9b14c36334d5.zip | |
Bug #341559: avoid conflict on new db-5 libdb_sql* libraries.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/db.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/db.eclass b/eclass/db.eclass index a02ea0556813..83976f675e96 100644 --- a/eclass/db.eclass +++ b/eclass/db.eclass @@ -1,6 +1,6 @@ # 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.40 2010/10/06 00:13:11 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.41 2010/10/18 17:39:02 robbat2 Exp $ # This is a common location for functions used in the sys-libs/db ebuilds # # Bugs: pauldv@gentoo.org @@ -25,7 +25,7 @@ db_fix_so() { # now rebuild all the correct ones for ext in so a; do - for name in libdb libdb_{cxx,tcl,java,stl}; do + for name in libdb libdb_{cxx,tcl,java,sql,stl}; do target=`find . -maxdepth 1 -type f -name "${name}-*.${ext}" |sort -n |tail -n 1` [ -n "${target}" ] && ln -sf ${target//.\//} ${name}.${ext} done; @@ -38,7 +38,7 @@ db_fix_so() { ln -sf libdb1.so.2 libdb-1.so fi # what do we do if we ever get 3.3 ? - for i in libdb libdb_{cxx,tcl,java,stl}; do + for i in libdb libdb_{cxx,tcl,java,sql,stl}; do if [ -f $i-3.2.so ]; then ln -sf $i-3.2.so $i-3.so ln -sf $i-3.2.so $i.so.3 @@ -137,7 +137,7 @@ db_src_install_usrlibcleanup() { rm -f \ "${D}"/usr/include/{db,db_185}.h \ - "${LIB}"/libdb{,_{cxx,stl,java,tcl}}.a + "${LIB}"/libdb{,_{cxx,sql,stl,java,tcl}}.a } db_src_test() { |