A few sparc and multilib fixes with the changing CHOST. Readded warning about crosscompiled glibc needing to be installed first before one can be emerged with nptl. Added some fedora updates (glibc-compat) and an updated mips patch from Kumba.

(Portage version: 2.0.51.18)

4 files changed, 69 insertions, 40 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 06bd6fdac4f4..d16915198ae1 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.320 2005/02/19 20:14:44 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.321 2005/03/04 12:43:12 eradicator Exp $
+
+  04 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20050125-r1.ebuild:
+  A few sparc and multilib fixes with the changing CHOST. Readded warning
+  about crosscompiled glibc needing to be installed first before one can be
+  emerged with nptl. Added some fedora updates (glibc-compat) and an updated
+  mips patch from Kumba.
 
   19 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
   glibc-2.3.4.20050125-r1.ebuild, glibc-2.3.4.20050125.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 41ca876caa2a..a365c3b89023 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6cd08b1d4a5b645cb759945a35b50c7a ChangeLog 68292
 MD5 5529417ce5503c488b1ccaaa2e781799 glibc-2.2.5-r9.ebuild 10915
 MD5 19b845756fd8e974c113e904396b9627 glibc-2.3.2-r12.ebuild 22153
@@ -11,7 +8,7 @@ MD5 ab06008394eb7c6aa17a674cae788eef glibc-2.3.4.20041102.ebuild 32888
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 b85c16a0e65a32784335e40fb0edac0e glibc-2.2.5-r10.ebuild 4418
 MD5 695f1e83d1cb212d83d97f0d2989cb94 glibc-2.3.4.20050125.ebuild 35240
-MD5 69d50068b267a3d2f3e5ea86dcd0727f glibc-2.3.4.20050125-r1.ebuild 36013
+MD5 fa22769eb36873e66248dcf1dce25c55 glibc-2.3.4.20050125-r1.ebuild 37142
 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
@@ -33,7 +30,7 @@ MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
 MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54
 MD5 5f2690b0a60b336ec8f26fa3a8898361 files/digest-glibc-2.3.4.20050125 371
 MD5 bed7cbcac1e8582deda43664e5b3f19c files/digest-glibc-2.2.5-r10 290
-MD5 26382a327ae4a10cfafceb20ca2c2f9c files/digest-glibc-2.3.4.20050125-r1 436
+MD5 2532004b5327460cd133e57f2b7c5e27 files/digest-glibc-2.3.4.20050125-r1 516
 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
 MD5 5182f441608833569cb9e78536baf8af files/2.2.5/glibc-2.2.5-arm-errlist-fix.diff 2210
@@ -142,10 +139,3 @@ MD5 340825c77e38e88e0ceaa12f154cbfa3 files/2.3.4/glibc-2.3.4.20040808-i386-got-f
 MD5 e109c03013bd08a2b96e2c2ca9017a4b files/2.3.4/glibc-gentoo-libdir.patch 1347
 MD5 bbe355d94c5a36e11f543d12b70b5702 files/2.3.4/glibc-sec-hotfix-20040916.patch 3080
 MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCJ5EwArHZZzCEUG0RAkWYAJ9yfbox7ey2lsvI3UTrbk5oGSlqCgCfeWtF
-w+qr/ssKexsRD7jiLE4iqQ8=
-=3OS+
------END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1 b/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1
index 0d88364c0517..f8d2878cb47f 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1
+++ b/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1
@@ -1,6 +1,7 @@
 MD5 174ac5ed4f2851fcc866a3bac1e4a6a5 glibc-2.3.4.tar.bz2 13213560
 MD5 7a199cd4965eb5622163756ae64358fe glibc-linuxthreads-2.3.4.tar.bz2 236183
-MD5 777b71b0f9c18be19990f1e3e589a566 glibc-2.3.4-patches-1.3.tar.bz2 32070
+MD5 1121ef72702470c712a4b64a155c0d4a glibc-2.3.4-patches-1.4.tar.bz2 32627
 MD5 071ec6e3562813a382b75610980bab98 glibc-manpages-2.3.4-r1.tar.bz2 22276
 MD5 04166455bebb5563bb9a8feca2e3c26c glibc-infopages-2.3.4-r1.tar.bz2 1294898
-MD5 769baadfe5d505bd171bcfea1a20239c c_stubs-2.1.2.tar.bz2 10486
+MD5 733cddb52c40a5656053631d31fe3cc7 libidn-0.5.13.tar.gz 1965864
+MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998
diff --git a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
index 4bf37bfb6fc3..b634092280ae 100644
--- a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.6 2005/03/03 22:33:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.7 2005/03/04 12:43:13 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -27,17 +27,22 @@ GLIBC_MANPAGE_VERSION="2.3.4-r1"
 GLIBC_INFOPAGE_VERSION="2.3.4-r1"
 
 # Gentoo patchset
-PATCH_VER="1.3"
+PATCH_VER="1.4"
 
 # Libidn addon - http://www.gnu.org/software/libidn/
 #IDN_VER="0.5.13"
 #IDN_TARBALL="libidn-${IDN_VER}.tar.gz"
 #IDN_URI="http://josefsson.org/libidn/releases/${IDN_TARBALL}"
 
-# C Stubbs addon
-CSTUBS_VER="2.1.2"
-CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2"
-CSTUBS_URI="http://dev.gentoo.org/~eradicator/glibc/${CSTUBS_TARBALL}"
+# C Stubbs addon (contained in fedora, so ignoring)
+#CSTUBS_VER="2.1.2"
+#CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2"
+#CSTUBS_URI="http://dev.gentoo.org/~eradicator/glibc/${CSTUBS_TARBALL}"
+
+# Fedora addons
+FEDORA_VER="20041219T2331"
+FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2"
+FEDORA_URI="http://dev.gentoo.org/~eradicator/glibc/${FEDORA_TARBALL}"
 
 # (Recent snapshots fails with 2.6.5 and earlier)
 LT_KERNEL_VERSION="2.4.1"
@@ -156,6 +161,10 @@ get_glibc_src_uri() {
 		GLIBC_SRC_URI="${GLIBC_SRC_URI} ${CSTUBS_URI}"
 	fi
 
+	if [[ -n ${FEDORA_URI} ]] ; then
+		GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}"
+	fi
+
 	echo "${GLIBC_SRC_URI}"
 }
 
@@ -175,12 +184,17 @@ toolchain-glibc_src_unpack() {
 	if [[ -n ${IDN_TARBALL} ]] ; then
 		unpack ${IDN_TARBALL}
 		mv libidn-${IDN_VER} libidn
+		echo "#stub" > ${S}/libidn/configure
 	fi
 
 	if [[ -n ${CSTUBS_TARBALL} ]] ; then
 		unpack ${CSTUBS_TARBALL}
 	fi
 
+	if [[ -n ${FEDORA_TARBALL} ]] ; then
+		unpack ${FEDORA_TARBALL}
+	fi
+
 	if [[ -n ${PATCH_VER} ]] ; then
 		cd ${WORKDIR}
 		unpack ${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
@@ -581,7 +595,7 @@ setup_flags() {
 	strip-unsupported-flags
 	filter-flags -m32 -m64 -mabi=*
 
-	has_multilib_profile && CHOST="$(get_abi_CHOST)"
+	has_multilib_profile && CTARGET_OPT="$(get_abi_CHOST)"
 
 	case $(tc-arch) in
 		ppc)
@@ -598,17 +612,17 @@ setup_flags() {
 				case ${ABI} in
 					default|sparc)
 						if is-flag "-mcpu=ultrasparc3"; then
-							CHOST="sparcv9b-unknown-linux-gnu"
+							CTARGET_OPT="sparcv9b-unknown-linux-gnu"
 						else
-							CHOST="sparcv9-unknown-linux-gnu"
+							CTARGET_OPT="sparcv9-unknown-linux-gnu"
 						fi
 					;;
 					sparc64)
 						if is-flag "-mcpu=ultrasparc3"; then
-							CHOST="sparc64b-unknown-linux-gnu"
+							CTARGET_OPT="sparc64b-unknown-linux-gnu"
 							CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9b"
 						else
-							CHOST="sparc64-unknown-linux-gnu"
+							CTARGET_OPT="sparc64-unknown-linux-gnu"
 							CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9a"
 						fi
 
@@ -617,20 +631,24 @@ setup_flags() {
 				esac
 			else
 				if is-flag "-mcpu=ultrasparc3"; then
-					CHOST="sparcv9b-unknown-linux-gnu"
+					CTARGET_OPT="sparcv9b-unknown-linux-gnu"
 				elif { is_crosscompile && use nptl; } || is-flag "-mcpu=ultrasparc2" || is-flag "-mcpu=ultrasparc"; then
-					CHOST="sparcv9-unknown-linux-gnu"
+					CTARGET_OPT="sparcv9-unknown-linux-gnu"
 				fi
 			fi
 		;;
 	esac
 
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
+	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
 	fi
 
-	if $(tc-getCC) -v 2>&1 | grep -q 'gcc version 3.[0123]'; then
+	if $(tc-getCC ${CTARGET}) -v 2>&1 | grep -q 'gcc version 3.[0123]'; then
 		append-flags -finline-limit=2000
 	fi
 
@@ -666,7 +684,7 @@ check_nptl_support() {
 	echo
 
 	einfon "Checking gcc for __thread support ... "
-	if ! $(tc-getCC) -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null; then
+	if ! $(tc-getCC ${CTARGET}) -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null; then
 		echo "no"
 		echo
 		eerror "Could not find a gcc that supports the __thread directive!"
@@ -812,8 +830,8 @@ glibc_do_configure() {
 	myconf="${myconf}
 		--without-cvs
 		--enable-bind-now
-		--build=${CBUILD}
-		--host=${CTARGET}
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
 		--disable-profile
 		--without-gd
 		--with-headers=$(alt_headers)
@@ -823,6 +841,8 @@ glibc_do_configure() {
 		--libexecdir=$(alt_prefix)/lib/misc/glibc
 		${EXTRA_ECONF}"
 
+	export CC="$(tc-getCC ${CTARGET})"
+
 	GBUILDDIR="${WORKDIR}/build-${ABI}-${CTARGET}-$1"
 	mkdir -p ${GBUILDDIR}
 	cd ${GBUILDDIR}
@@ -1011,15 +1031,13 @@ if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
 	DEPEND="${DEPEND}
 	        >=${CATEGORY}/gcc-3.3.5-r1"
 
-# Set this if mips converts mips-headers to kernel-2.eclass rather than using
-# linux-headers.
-#	if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
-#		DEPEND="${DEPEND}
-#		        || ( >=${CATEGORY}/mips-headers-2.6.8.1 )"
-#	else
+	if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
+		DEPEND="${DEPEND}
+		        >=${CATEGORY}/mips-headers-2.6.10"
+	else
 		DEPEND="${DEPEND}
 		        >=${CATEGORY}/linux-headers-2.6.8"
-#	fi
+	fi
 fi
 
 RDEPEND="virtual/os-headers
@@ -1035,6 +1053,18 @@ pkg_setup() {
 		die "nptlonly without nptl"
 	fi
 
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] && ! has_version "${CATEGORY}/${PN}"; then
+		ewarn "This is your first install of ${CATEGORY}/${PN}, so we"
+		ewarn "must disable some configure checks to get glibc to compile.  You should"
+		ewarn "re-emerge ${CATEGORY}/${PN} after this one installs to"
+		ewarn "be safe.  Additionally, you must use -nptl for the first emerge."
+
+		want_nptl && die "You need to use -nptl when emerging a crosscompiled glibc for the first time"
+
+		ebeep
+		epause 5
+	fi
+
 	# give some sort of warning about the nptl logic changes...
 	if want_nptl && want_linuxthreads ; then
 		ewarn "Warning! Gentoo's GLIBC with NPTL enabled now behaves like the"
@@ -1044,6 +1074,7 @@ pkg_setup() {
 		ewarn "used by default. If you do not need nor want the linuxthreads"
 		ewarn "fallback, you can disable this behavior by adding nptlonly to"
 		ewarn "USE to save yourself some compile time."
+
 		ebeep
 		epause 5
 	fi
@@ -1094,7 +1125,7 @@ src_unpack() {
 	# http://sources.redhat.com/ml/libc-alpha/2003-09/msg00100.html
 	# http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html
 	echo 'int main(){}' > ${T}/gcc_eh_test.c
-	if ! $(tc-getCC) ${T}/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then
+	if ! $(tc-getCC ${CTARGET}) ${T}/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then
 		sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh"
 	fi