[patch] db.eclass prefix patch

db.eclass.patch (text/plain), 2.44 KB, created by Fabian Groffen on 2018-12-17 09:37:52 UTC

--- gx86/eclass/db.eclass	2017-11-26 02:41:14.000000000 +0000
+++ prfx/eclass/db.eclass	2018-06-06 14:13:30.231209625 +0000
@@ -23,29 +23,41 @@
 	cd "${LIB}"
 
 	# first clean up old symlinks
-	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*so' -exec rm \{} \;
-	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*so.[23]' -exec rm \{} \;
+	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"$(get_libname)" -exec rm \{} \;
+	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"$(get_libname "[23]")" -exec rm \{} \;
 	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*a' -exec rm \{} \;
 
 	# now rebuild all the correct ones
-	for ext in so a; do
+	for ext in so a dylib sl; 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}
+			[ -n "${target}" ] || continue;
+			case ${CHOST} in 
+			*-aix*)
+				aixdll --merge-runtime \
+					--keepdir=false \
+					--target="${name}.${ext}" \
+					--current="${target}" \
+					`find . -maxdepth 1 -type f -name "${name}-*.${ext}"`
+				;;
+			*)
+				ln -sf ${target//.\//} ${name}.${ext}
+				;;
+			esac;
 		done;
 	done;
 
 	# db[23] gets some extra-special stuff
-	if [ -f libdb1.so.2 ]; then
-		ln -sf libdb1.so.2 libdb.so.2
-		ln -sf libdb1.so.2 libdb1.so
-		ln -sf libdb1.so.2 libdb-1.so
+	if [ -f libdb1$(get_libname 2) ]; then
+		ln -sf libdb1$(get_libname 2) libdb$(get_libname 2)
+		ln -sf libdb1$(get_libname 2) libdb1$(get_libname)
+		ln -sf libdb1$(get_libname 2) libdb-1$(get_libname)
 	fi
 	# what do we do if we ever get 3.3 ?
 	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
+		if [ -f $i-3$(get_libname 2) ]; then
+			ln -sf $i-3$(get_libname 2) $i-3$(get_libname)
+			ln -sf $i-3$(get_libname 2) $i$(get_libname 3)
 		fi
 	done
 
@@ -139,8 +151,8 @@
 		mv "${LIB}/libdb_cxx.a" "${LIB}/libdb_cxx-${SLOT}.a"
 	fi
 
-	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*so' -exec rm \{} \;
-	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*so.[23]' -exec rm \{} \;
+	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"$(get_libname)" -exec rm \{} \;
+	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"$(get_libname "[23]")" -exec rm \{} \;
 	einfo "removing unversioned static archives"
 	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*a' -exec rm \{} \;