[patch] toolchain.eclass.patch

toolchain.eclass.patch (text/plain), 2.55 KB, created by Jeremy Huddleston (RETIRED) on 2005-07-02 16:05:32 UTC

? toolchain.eclass.patch
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.169
diff -p -u -4 -r1.169 toolchain.eclass
--- toolchain.eclass	13 Jun 2005 23:26:03 -0000	1.169
+++ toolchain.eclass	2 Jul 2005 23:04:25 -0000
@@ -746,9 +746,9 @@ create_gcc_env_entry() {
 #----<< specs + env.d logic >>----
 
 #---->> pkg_* <<----
 gcc_pkg_setup() {
-	if [[ $(tc-arch) == "amd64" ]] && [[ ${LD_PRELOAD} == "/lib/libsandbox.so" ]] && is_multilib ; then
+	if [[ ( $(tc-arch) == "amd64" || $(tc-arch) == "ppc64" ) && ( ${LD_PRELOAD} == "/lib/libsandbox.so" || ${LD_PRELOAD} == "/usr/lib/libsandbox.so" ) ]] && is_multilib ; then
 		eerror "Sandbox in your installed portage does not support compilation."
 		eerror "of a multilib gcc.  Please set FEATURES=-sandbox and try again."
 		eerror "After you have a multilib gcc, re-emerge portage to have a working sandbox."
 		die "No 32bit sandbox.  Retry with FEATURES=-sandbox."
@@ -904,9 +904,9 @@ gcc_src_unpack() {
 	done
 	ht_fix_file ${fix_files} */configure *.sh
 
 	if ! is_crosscompile && is_multilib && \
-	   [[ $(tc-arch) == "amd64" && -z ${SKIP_MULTILIB_HACK} ]] ; then
+	   [[ ( $(tc-arch) == "amd64" || $(tc-arch) == "ppc64" ) && -z ${SKIP_MULTILIB_HACK} ]] ; then
 		disgusting_gcc_multilib_HACK || die "multilib hack failed"
 	fi
 
 	if is_crosscompile && is_multilib; then
@@ -1948,14 +1948,30 @@ gcc_version_patch() {
 #
 # Travis Tilley <[e-mail]> (03 Sep 2004)
 #
 disgusting_gcc_multilib_HACK() {
+	local config
 	local libdirs
-	has_multilib_profile \
-		&& libdirs="../$(get_abi_LIBDIR amd64) ../$(get_abi_LIBDIR x86)" \
-		|| libdirs="../$(get_libdir) ../$(get_multilibdir)"
+	if has_multilib_profile ; then
+		case $(tc-arch) in
+			amd64)
+				config="i386/t-linux64"
+				libdirs="../$(get_abi_LIBDIR amd64) ../$(get_abi_LIBDIR x86)" \
+			;;
+			ppc64)
+				config="rs6000/t-linux64"
+				libdirs="../$(get_abi_LIBDIR ppc64) ../$(get_abi_LIBDIR ppc)" \
+			;;
+		esac
+	else
+		# Remove this hunk when amd64's 2004.3 is purged from portage.
+		use amd64 || die "Your profile is no longer supported by portage."
+		config="i386/t-linux64"
+		libdirs="../$(get_libdir) ../$(get_multilibdir)"
+	fi
+
 	einfo "updating multilib directories to be: ${libdirs}"
-	sed -i -e "s:^MULTILIB_OSDIRNAMES.*:MULTILIB_OSDIRNAMES = ${libdirs}:" ${S}/gcc/config/i386/t-linux64
+	sed -i -e "s:^MULTILIB_OSDIRNAMES.*:MULTILIB_OSDIRNAMES = ${libdirs}:" ${S}/gcc/config/${config}
 }
 
 gcc_crosscompile_multilib_specs() {
 	local config=