Added infopages. Fixed up cross-compilation for multilib CTARGETS. Don't think we're multilib when crosscompiling for sparc-* or mips-*. Added >=sys-devel/gcc-config-1.3.9 dependency for cross-compile multilib support. Fixed some lib -> $(get_libdir) problems. This should be the final commit before it can come out of package.mask.

Package-Manager: portage-2.0.51-r15

4 files changed, 76 insertions, 42 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index aeb3f4a032d0..f761c1e340bd 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.312 2005/02/07 06:38:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.313 2005/02/10 23:35:58 eradicator Exp $
+
+  10 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20050125.ebuild:
+  Added infopages. Fixed up cross-compilation for multilib CTARGETS. Don't
+  think we're multilib when crosscompiling for sparc-* or mips-*. Added
+  >=sys-devel/gcc-config-1.3.9 dependency for cross-compile multilib support.
+  Fixed some lib -> $(get_libdir) problems. This should be the final commit
+  before it can come out of package.mask.
 
   06 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
   glibc-2.3.4.20050125.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index f9bcec999fd3..e737276f6925 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 37b85adec9cce8652c2cff44710c6ceb ChangeLog 66306
+MD5 8aa6e0cc4d769d22cdafed49343d73b0 ChangeLog 66738
 MD5 5529417ce5503c488b1ccaaa2e781799 glibc-2.2.5-r9.ebuild 10915
 MD5 19b845756fd8e974c113e904396b9627 glibc-2.3.2-r12.ebuild 22153
 MD5 1dee5d2dea67ffe479a0005cc7da35ce glibc-2.3.3.20040420-r2.ebuild 21626
@@ -10,7 +10,7 @@ MD5 63f67cbcb98920a75ba0b1a4b781519c glibc-2.3.4.20040808-r1.ebuild 27601
 MD5 96dc89a3ebadd5f1260ce517ffe6fef3 glibc-2.3.4.20041102.ebuild 32955
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 b85c16a0e65a32784335e40fb0edac0e glibc-2.2.5-r10.ebuild 4418
-MD5 7ef99d6e9359b37087ed7d9051b4d01d glibc-2.3.4.20050125.ebuild 32158
+MD5 8ff4bcf0c981e3635bcfbb4a7771579d glibc-2.3.4.20050125.ebuild 32900
 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312
 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312
@@ -30,7 +30,7 @@ MD5 bedcd868a9462009158714238594173c files/nscd 964
 MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
 MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
 MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54
-MD5 7655b3379831c150e2b4c842380fa690 files/digest-glibc-2.3.4.20050125 293
+MD5 3b3e1c6d6665df403cd3c7957230cce1 files/digest-glibc-2.3.4.20050125 371
 MD5 bed7cbcac1e8582deda43664e5b3f19c files/digest-glibc-2.2.5-r10 290
 MD5 f75ebd335c4b882013cc12229d39c9f7 files/2.2.5/glibc-2.2.5-alpha-gcc3-fix.diff 475
 MD5 843eaa26ae2c49e894aa365b6f463546 files/2.2.5/glibc-2.2.5-alpha-pcdyn-fix.diff 471
@@ -143,7 +143,7 @@ MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCC0AoArHZZzCEUG0RAqvXAJ9FJq8mYtgH1FwwbgVWGU/dAzOdZwCfUgbY
-0QBt9UUv5ClTaS8J9S4D68s=
-=IvJD
+iD8DBQFCC/A/ArHZZzCEUG0RAtORAJwNSV0HbaluBV5UZj+v4AY880VmbQCeMP5m
+jTVQ2ryyxarmLJuE9EsogU0=
+=KEBR
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.4.20050125 b/sys-libs/glibc/files/digest-glibc-2.3.4.20050125
index be6ebd940310..13fafc5aa4b8 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.4.20050125
+++ b/sys-libs/glibc/files/digest-glibc-2.3.4.20050125
@@ -2,3 +2,4 @@ MD5 174ac5ed4f2851fcc866a3bac1e4a6a5 glibc-2.3.4.tar.bz2 13213560
 MD5 7a199cd4965eb5622163756ae64358fe glibc-linuxthreads-2.3.4.tar.bz2 236183
 MD5 0c139d02912b9b64d1bc8aa1159d3bb5 glibc-2.3.4-patches-1.1.tar.bz2 31847
 MD5 071ec6e3562813a382b75610980bab98 glibc-manpages-2.3.4-r1.tar.bz2 22276
+MD5 04166455bebb5563bb9a8feca2e3c26c glibc-infopages-2.3.4-r1.tar.bz2 1294898
diff --git a/sys-libs/glibc/glibc-2.3.4.20050125.ebuild b/sys-libs/glibc/glibc-2.3.4.20050125.ebuild
index 5f2927a4c435..495a62550699 100644
--- a/sys-libs/glibc/glibc-2.3.4.20050125.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20050125.ebuild
@@ -1,13 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125.ebuild,v 1.7 2005/02/10 11:06:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125.ebuild,v 1.8 2005/02/10 23:35:58 eradicator Exp $
 
 KEYWORDS="~amd64 ~mips ~sparc ~x86"
 
 BRANCH_UPDATE=""
+
+# From linuxthreads/man
 GLIBC_MANPAGE_VERSION="2.3.4-r1"
-#GLIBC_INFOPAGE_VERSION="2.3.4-r1"
-GLIBC_INFOPAGE_VERSION="none"
+
+# From manual
+GLIBC_INFOPAGE_VERSION="2.3.4-r1"
 
 PATCH_VER="1.1"
 
@@ -131,23 +134,26 @@ toolchain-glibc_src_unpack() {
 
 	if use !nptl || use !nptlonly; then
 		cd ${S}
-			unpack ${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
-		cd ${WORKDIR}
+		unpack ${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
 	fi
 
 	if [[ -n ${PATCH_VER} ]]; then
+		cd ${WORKDIR}
 		unpack ${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
 	fi
 
 	if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]]; then
+		cd ${WORKDIR}
 		unpack ${PN}-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
 	fi
 
 	if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]]; then
+		cd ${S}
 		unpack ${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
 	fi
 
 	if [[ -n "${BRANCH_UPDATE}" ]]; then
+		cd ${WORKDIR}
 		unpack ${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
 	fi
 
@@ -358,12 +364,12 @@ EOF
 	fi
 
 	if use pic && ! use amd64 ; then
-		find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}/lib/soinit.o \;
-		find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}/lib/sofini.o \;
-		find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}/lib \;
-		find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}/lib \;
+		find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}/$(get_libdir)/soinit.o \;
+		find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}/$(get_libdir)/sofini.o \;
+		find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}/$(get_libdir) \;
+		find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}/$(get_libdir) \;
 
-		for i in ${D}/lib/*.map; do
+		for i in ${D}/$(get_libdir)/*.map; do
 			mv ${i} ${i%.map}_pic.map
 		done
 	fi
@@ -389,8 +395,7 @@ EOF
 		if ! has noinfo ${FEATURES} && [[ "${GLIBC_INFOPAGE_VERSION}" != "none" ]]; then
 			einfo "Installing info pages..."
 
-			cd ${S}/info
-			make PARALLELMFLAGS="${MAKEOPTS}" \
+			make PARALLELMFLAGS="${MAKEOPTS} -j1" \
 				install_root=${D} \
 				info -i
 		fi
@@ -401,7 +406,7 @@ EOF
 			einfo "Installing man pages..."
 
 			# Install linuxthreads man pages even if nptl is enabled
-			cd ${S}/man
+			cd ${WORKDIR}/man
 			doman *.3thr
 		fi
 
@@ -421,7 +426,7 @@ EOF
 		done
 
 		einfo "Installing Timezone data..."
-		make PARALLELMFLAGS="${MAKEOPTS}" \
+		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
 			install_root=${D} \
 			timezone/install-others || die
 	fi
@@ -532,24 +537,6 @@ setup_flags() {
 		local new_target
 
 		case ${ABI} in
-			x86)
-				new_target="i686-pc-linux-gnu"
-			;;
-			amd64)
-				new_target="x86_64-pc-linux-gnu"
-			;;
-			o32)
-				new_target="mips-unknown-linux-gnu"
-			;;
-			n32|n64)
-				new_target="mips64-unknown-linux-gnu"
-			;;
-			ppc)
-				new_target="powerpc-unknown-linux-gnu"
-			;;
-			ppc64)
-				new_target="powerpc64-unknown-linux-gnu"
-			;;
 			sparc)
 				if is-flag "-mcpu=ultrasparc3"; then
 						new_target="sparcv9b-unknown-linux-gnu"
@@ -568,6 +555,9 @@ setup_flags() {
 
 				filter-flags -Wa,-xarch -Wa,-A
 			;;
+			*)
+				new_target=$(get_abi_CHOST)
+			;;
 		esac
 
 		if is_crosscompile; then
@@ -848,7 +838,27 @@ is_crosscompile() {
 
 use_multilib() {
 	case $(tc-arch) in
-		amd64|mips|sparc) # |ppc64
+		sparc)
+			case ${CTARGET} in
+				sparc64*)
+					is_crosscompile || has_multilib_profile || use multilib
+					;;
+				*)
+					false
+					;;
+			esac
+		;;
+		mips)
+			case ${CTARGET} in
+				mips64*)
+					is_crosscompile || has_multilib_profile || use multilib
+					;;
+				*)
+					false
+					;;
+			esac
+		;;
+		amd64|ppc64)
 			is_crosscompile || has_multilib_profile || use multilib
 		;;
 		*)
@@ -857,34 +867,44 @@ use_multilib() {
 	esac
 }
 
+# Setup toolchain variables that would be defined in the profiles for these archs.
 crosscompile_setup() {
 	if use_multilib; then
 		case $(tc-arch) in
 			amd64)
 				export CFLAGS_x86="${CFLAGS_x86--m32}"
+				export CHOST_x86="i686-pc-linux-gnu"
 				export CFLAGS_amd64="${CFLAGS_amd64--m64}"
+				export CHOST_amd64="x86_64-pc-linux-gnu"
 
 				export MULTILIB_ABIS="x86 amd64"
 				export DEFAULT_ABI="amd64"
 			;;
 			mips)
 				export CFLAGS_o32="${CFLAGS_o32--mabi=32}"
+				export CHOST_o32="mips-unknown-linux-gnu"
 				export CFLAGS_n32="${CFLAGS_n32--mabi=n32}"
+				export CHOST_n32="mips64-unknown-linux-gnu"
 				export CFLAGS_n64="${CFLAGS_n64--mabi=n64}"
+				export CHOST_n64="mips64-unknown-linux-gnu"
 
 				export MULTILIB_ABIS="n64 n32 o32"
 				export DEFAULT_ABI="o32"
 			;;
 			ppc64)
 				export CFLAGS_ppc="${CFLAGS_ppc--m32}"
+				export CHOST_ppc="powerpc-unknown-linux-gnu"
 				export CFLAGS_ppc64="${CFLAGS_ppc64--m64}"
+				export CHOST_ppc64="powerpc64-unknown-linux-gnu"
 
 				export MULTILIB_ABIS="ppc ppc64"
 				export DEFAULT_ABI="ppc64"
 			;;
 			sparc)
 				export CFLAGS_sparc="${CFLAGS_sparc--m32}"
+				export CHOST_sparc="sparc-unknown-linux-gnu"
 				export CFLAGS_sparc64="${CFLAGS_sparc64--m64}"
+				export CHOST_sparc64="sparc64-unknown-linux-gnu"
 
 				export MULTILIB_ABIS="sparc64 sparc"
 				export DEFAULT_ABI="sparc"
@@ -913,10 +933,13 @@ RESTRICT="nostrip multilib-pkg-force"
 # We also need linux26-headers if using NPTL. Including kernel headers is
 # incredibly unreliable, and this new linux-headers release from plasmaroo
 # should work with userspace apps, at least on amd64 and ppc64.
+#
+# The gcc-config dep is for the cross-compile multilib stuff
 DEPEND=">=sys-devel/gcc-3.2.3-r1
 	nptl? ( >=sys-devel/gcc-3.3.1-r1
 	        || ( >=sys-kernel/linux-headers-2.6.5 >=sys-kernel/linux26-headers-2.6.5 ) )
 	>=sys-devel/binutils-2.14.90.0.6-r1
+	>=sys-devel/gcc-config-1.3.9
 	virtual/os-headers
 	nls? ( sys-devel/gettext )"
 
@@ -1012,6 +1035,7 @@ src_compile() {
 	unset MLTEST
 
 	ABI=${ABI:-default}
+
 	toolchain-glibc_src_compile
 }
 
@@ -1055,7 +1079,7 @@ src_install() {
 
 	# Handle stupid lib32 BS
 	unset OLD_LIBDIR
-	if [ "$(tc-arch)" = "amd64" -a "${ABI}" = "x86" -a "$(get_libdir)" != "lib" ]; then
+	if [[ "$(tc-arch)" = "amd64" && "${ABI}" = "x86" && "$(get_libdir)" != "lib" ]] && ! is_crosscompile; then
 		OLD_LIBDIR="$(get_libdir)"
 		LIBDIR_x86="lib"
 	fi
@@ -1063,7 +1087,8 @@ src_install() {
 	toolchain-glibc_src_install
 
 	# Handle stupid lib32 BS on amd64
-	if [ -n "${OLD_LIBDIR}" ]; then
+	if [[ -n "${OLD_LIBDIR}" ]]; then
+		cd ${S}
 		LIBDIR_x86="${OLD_LIBDIR}"
 		unset OLD_LIBDIR