[patch] patch of portage/bin to use LIBDIR_${ABI} instead of CONF_LIBDIR if it is defined

portage-bin-multilib.patch (text/plain), 2.04 KB, created by Jeremy Huddleston (RETIRED) on 2004-12-23 01:40:08 UTC

Index: dolib
===================================================================
RCS file: /var/cvsroot/gentoo-src/portage/bin/dolib,v
retrieving revision 1.8
diff -u -1 -b -p -r1.8 dolib
--- dolib	10 Oct 2004 10:07:20 -0000	1.8
+++ dolib	23 Dec 2004 09:16:37 -0000
@@ -5,2 +5,6 @@
 
+if [ -n "$(eval echo \${LIBDIR_${ABI}})" ]; then        
+	CONF_LIBDIR="$(eval echo \${LIBDIR_${ABI}})"        
+fi        
+
 if [ -z "${CONF_LIBDIR}" ]; then
Index: ebuild-functions.sh
===================================================================
RCS file: /var/cvsroot/gentoo-src/portage/bin/ebuild-functions.sh,v
retrieving revision 1.4
diff -u -1 -b -p -r1.4 ebuild-functions.sh
--- ebuild-functions.sh	9 Dec 2004 17:10:27 -0000	1.4
+++ ebuild-functions.sh	23 Dec 2004 09:16:37 -0000
@@ -90,3 +90,6 @@ econf() {
 		# if the ebuild passes in --libdir, they're responsible for the conf_libdir fun.
-		if [ ! -z "${CONF_LIBDIR}" ] && [ "${*/--libdir}" == "$*" ]; then
+		if [ -n "$(eval echo \${LIBDIR_${ABI}})" ]; then
+			CONF_LIBDIR="$(eval echo \${LIBDIR_${ABI}})"
+		fi
+		if [ -n "${CONF_LIBDIR}" ] && [ "${*/--libdir}" == "$*" ]; then
 			if [ "${*/--prefix}" == "$*" ]; then
@@ -140,3 +143,6 @@ einstall() 
 	# CONF_PREFIX is only set if they didn't pass in libdir above
-	if [ ! -z "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:-unset}" != "unset" ]; then
+	if [ -n "$(eval echo \${LIBDIR_${ABI}})" ]; then
+		CONF_LIBDIR="$(eval echo \${LIBDIR_${ABI}})"
+	fi
+	if [ -n "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:-unset}" != "unset" ]; then
 		EXTRA_EINSTALL="libdir=${D}/${CONF_PREFIX}/${CONF_LIBDIR} ${EXTRA_EINSTALL}"
Index: preplib
===================================================================
RCS file: /var/cvsroot/gentoo-src/portage/bin/preplib,v
retrieving revision 1.7
diff -u -1 -b -p -r1.7 preplib
--- preplib	4 Oct 2004 13:56:50 -0000	1.7
+++ preplib	23 Dec 2004 09:16:37 -0000
@@ -5,2 +5,6 @@
 
+if [ -n "$(eval echo \${LIBDIR_${ABI}})" ]; then                
+        CONF_LIBDIR="$(eval echo \${LIBDIR_${ABI}})"                
+fi        
+
 if [ -z "${CONF_LIBDIR}" ]; then