[patch] patch for glibc-2.3.4.20041102-r1.ebuild

glibc-2.3.4.20041102-r1.ebuild.patch (text/plain), 3.02 KB, created by Yuta SATOH (RETIRED) on 2005-07-06 06:57:47 UTC

--- glibc-2.3.4.20041102-r1.ebuild.orig	2005-06-11 14:07:53.000000000 +0900
+++ glibc-2.3.4.20041102-r1.ebuild	2005-07-06 22:58:50.000000000 +0900
@@ -180,6 +180,22 @@
 		filter-flags -m32 -m64
 	fi
 
+	# PPC64 multilib
+	if use ppc64 && has_multilib_profile; then
+		# We change our CHOST, so set this right here
+		export CC="$(tc-getCC)"
+
+		if [ "${ABI}" = "ppc64" ]; then
+			CTARGET="powerpc64-unknown-linux-gnu"
+			CHOST="${CTARGET}"
+		else
+			CTARGET="powerpc-unknown-linux-gnu"
+			CHOST="${CTARGET}"
+		fi
+
+		filter-flags -m32 -m64
+	fi
+
 	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
 		# broken in 3.4.x
 		replace-flags -march=pentium-m -mtune=pentium3
@@ -777,9 +793,14 @@
 				LIBDIR_x86="lib"
 			fi
 
+			if use ppc64 && [ "${ABI}" = "ppc" -a "$(get_libdir)" != "lib" ]; then
+				OLD_LIBDIR="$(get_libdir)"
+				LIBDIR_ppc="lib"
+			fi
+
 			src_install
 
-			# Handle stupid lib32 BS
+			# Handle stupid lib32 BS on amd64 and ppc64
 			if use amd64 && [ "${ABI}" = "x86" -a -n "${OLD_LIBDIR}" ]; then
 				LIBDIR_x86="${OLD_LIBDIR}"
 				unset OLD_LIBDIR
@@ -803,6 +824,28 @@
 				done
 			fi
 
+			if use ppc64 && [ "${ABI}" = "ppc" -a -n "${OLD_LIBDIR}" ]; then
+				LIBDIR_ppc="${OLD_LIBDIR}"
+				unset OLD_LIBDIR
+
+				mv ${D}/lib ${D}/$(get_libdir)
+				mv ${D}/usr/lib ${D}/usr/$(get_libdir)
+				mkdir ${D}/lib
+				dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1
+				dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/libc.so /usr/$(get_libdir)/libpthread.so
+
+				rm -rf ${D}/usr/$(get_libdir)/misc ${D}/usr/$(get_libdir)/locale
+
+				for f in ${D}/usr/$(get_libdir)/*.so; do
+					local basef=$(basename ${f})
+					if [ -L ${f} ]; then
+						local target=$(readlink ${f})
+						target=${target/\/lib\//\/$(get_libdir)\/}
+						rm ${f}
+						dosym ${target} /usr/$(get_libdir)/${basef}
+					fi
+				done
+			fi
 		done
 		ABI="${OABI}"
 		unset OABI
@@ -1048,7 +1091,8 @@
 		rm ${ROOT}/lib64
 		# now that lib64 is gone, nothing will run without calling ld.so
 		# directly. luckily the window of brokenness is almost non-existant
-		/lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
+		use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
+		use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64
 		# all better :)
 		ldconfig
 		ln -s lib64 ${ROOT}/lib
@@ -1081,7 +1125,7 @@
 	# 2005.0 is setup properly, and this is executed as part of the
 	# 2004.3 -> 2005.0 upgrade script.
 	# It can be removed after 2004.3 has been purged from portage.
-	use amd64 && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks
+	( use amd64 || use ppc64 ) && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks
 
 	# it appears that /lib/tls is sometimes not removed. See bug
 	# 69258 for more info.
@@ -1116,7 +1160,7 @@
 		${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT}
 	fi
 
-	if [ ! -e "${ROOT}/ld.so.1" ] && use ppc64
+	if [ ! -e "${ROOT}/ld.so.1" ] && use ppc64 && ! has_multilib_profile
 	then
 		pushd ${ROOT}
 		cd ${ROOT}/lib