Align with gentoo-x86 3 Mar 2007

svn path=/; revision=185

4 files changed, 32 insertions, 33 deletions

diff --git a/hardened/toolchain/branches/pieworld/eclass/toolchain.eclass b/hardened/toolchain/branches/pieworld/eclass/toolchain.eclass
index 2096027..6bb2351 100644
--- a/hardened/toolchain/branches/pieworld/eclass/toolchain.eclass
+++ b/hardened/toolchain/branches/pieworld/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.328 2007/02/18 02:12:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.329 2007/02/22 02:09:24 vapier Exp $
 
 HOMEPAGE="http://gcc.gnu.org/"
 LICENSE="GPL-2 LGPL-2.1"
@@ -1345,7 +1345,7 @@ gcc_do_configure() {
 		if [[ ${GCCMAJOR}.${GCCMINOR} > 4.1 ]] ; then
 			confgcc="${confgcc} --disable-bootstrap --disable-libgomp"
 		fi
-	elif [[ ${CHOST} != mingw* ]] ; then
+	elif [[ ${CHOST} != mingw* ]] && [[ ${CHOST} != *-mingw* ]] ; then
 		confgcc="${confgcc} --enable-shared --enable-threads=posix"
 
 		if [[ ${GCCMAJOR}.${GCCMINOR} > 4.1 ]] ; then
diff --git a/hardened/toolchain/branches/pieworld/sys-libs/glibc/Manifest b/hardened/toolchain/branches/pieworld/sys-libs/glibc/Manifest
index ca67798..2d04672 100644
--- a/hardened/toolchain/branches/pieworld/sys-libs/glibc/Manifest
+++ b/hardened/toolchain/branches/pieworld/sys-libs/glibc/Manifest
@@ -18,10 +18,10 @@ AUX 2.5/glibc-2.5-hardened-pie.patch 1522 RMD160 cd6d0fa46973a7f7b4575946998478d
 MD5 f58815648658826e79ea33722d6c0742 files/2.5/glibc-2.5-hardened-pie.patch 1522
 RMD160 cd6d0fa46973a7f7b4575946998478d148268a50 files/2.5/glibc-2.5-hardened-pie.patch 1522
 SHA256 25fc868ba67ba6b6e3476c5786dd493039bb06c70459a5f0c2b12602d294eec3 files/2.5/glibc-2.5-hardened-pie.patch 1522
-AUX nscd 1468 RMD160 4358dc846a186c9db730693f9485b4d4358f3967 SHA1 f340187d998effff8b84250394a608c7305539bf SHA256 12b5d0732e646b3a456646b943930cc5c21cc82635e42ccefe8f197e61d570fe
-MD5 1314d7f9022322cd0d1198dcddf1214d files/nscd 1468
-RMD160 4358dc846a186c9db730693f9485b4d4358f3967 files/nscd 1468
-SHA256 12b5d0732e646b3a456646b943930cc5c21cc82635e42ccefe8f197e61d570fe files/nscd 1468
+AUX nscd 1621 RMD160 f6d20c4c3814f70d7741f3fa2e0b53ba32c37960 SHA1 5751fe798024c2021b7b3ed3e798618e2a38244a SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8
+MD5 d142c6e0b4fd508f485d0aa9c5d12a91 files/nscd 1621
+RMD160 f6d20c4c3814f70d7741f3fa2e0b53ba32c37960 files/nscd 1621
+SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8 files/nscd 1621
 AUX nscd.conf 1158 RMD160 50651e89a0cb206b1d37dae8840527694fe561b5 SHA1 5f5166aa6e0bffa57c52c39d3ec51ad3b0efa607 SHA256 378b7953adf5aa0e03bff49b7c654cae67b3efee7c92361b385fe7d3e9fb57c7
 MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
 RMD160 50651e89a0cb206b1d37dae8840527694fe561b5 files/nscd.conf 1158
@@ -35,10 +35,10 @@ DIST glibc-2.5.tar.bz2 15321839 RMD160 25a0a460c0db1e5b7c570e5087461696f2096fd2
 DIST glibc-libidn-2.5.tar.bz2 102330 RMD160 e10e85e0ee7cdab2e5518a93978cb688ccabee88 SHA1 ee7e019e01aa338e28db1eeb34abb2cb09d2f30a SHA256 de77e49e0beee6061d4c6e480f322566ba25d4e5e018c456a18ea4a8da5c0ede
 DIST glibc-linuxthreads-2.5.tar.bz2 242445 RMD160 788484d035d53ac39aac18f6e3409a912eea1cfa SHA1 eb7765e5c0a14c7475f1c8b92cbe1f625a8fd76f SHA256 ee27aeba6124a8b351c720eb898917f0f8874d9a384cc2f17aa111a3d679bd2c
 DIST glibc-ports-2.5.tar.bz2 409372 RMD160 e7e29df135a5f0f72760d10e5ad46de038e40725 SHA1 7da6257e641759ed29c4d316700fce6f604bc812 SHA256 80c38a005325e7539012bd665fb8e06af9ee9bfc74efb236ebff121265bfd463
-EBUILD glibc-2.5.ebuild 40151 RMD160 635e19207990c16d4c15683bac0aa7fb1ac453f4 SHA1 4d532562cacd15178520da887687b88680a357e4 SHA256 f5a98a69306171b42443e5b78916ff82f0b4b596b7fa85a3b243a2ddfcdb260d
-MD5 9b2045b68b03d5242846c45845cd7cb9 glibc-2.5.ebuild 40151
-RMD160 635e19207990c16d4c15683bac0aa7fb1ac453f4 glibc-2.5.ebuild 40151
-SHA256 f5a98a69306171b42443e5b78916ff82f0b4b596b7fa85a3b243a2ddfcdb260d glibc-2.5.ebuild 40151
+EBUILD glibc-2.5.ebuild 40048 RMD160 8301182ff0deb3444cdbeacdecb3d59070dce2c4 SHA1 b089e7b045b31382d81368b23140ffb5828d69af SHA256 100f0acd53305090e338d8375c728b521e1940bf6512189a82e1b3cde2cd818b
+MD5 60ab7cab96377028dc9635493cbaf55f glibc-2.5.ebuild 40048
+RMD160 8301182ff0deb3444cdbeacdecb3d59070dce2c4 glibc-2.5.ebuild 40048
+SHA256 100f0acd53305090e338d8375c728b521e1940bf6512189a82e1b3cde2cd818b glibc-2.5.ebuild 40048
 MD5 5b7e320e8b8b1a96ace60aa95385c122 files/digest-glibc-2.5 1286
 RMD160 6302561abceb3a88449dfe74bd6f2e373f00dec3 files/digest-glibc-2.5 1286
 SHA256 c20b8f42085597085e3589fbfd2dc5351f0c63a5492a55f82b59a1481b2a28f3 files/digest-glibc-2.5 1286
diff --git a/hardened/toolchain/branches/pieworld/sys-libs/glibc/files/nscd b/hardened/toolchain/branches/pieworld/sys-libs/glibc/files/nscd
index a683e8f..b102de0 100755
--- a/hardened/toolchain/branches/pieworld/sys-libs/glibc/files/nscd
+++ b/hardened/toolchain/branches/pieworld/sys-libs/glibc/files/nscd
@@ -1,18 +1,18 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/nscd,v 1.6 2006/06/18 06:49:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/nscd,v 1.7 2007/02/23 12:09:39 uberlord Exp $
 
 depend() {
 	use dns ldap net slapd
 }
 
 checkconfig() {
-	if [[ ! -d /var/run/nscd ]] ; then
+	if [ ! -d /var/run/nscd ] ; then
 		mkdir -p /var/run/nscd
 		chmod 755 /var/run/nscd
 	fi
-	if [[ -z ${NSCD_PERMS_OK} && $(stat -c %a /var/run/nscd) != "755" ]] ; then
+	if [ -z "${NSCD_PERMS_OK}" ] && [ "$(stat -c %a /var/run/nscd)" != "755" ] ; then
 		echo ""
 		ewarn "nscd run dir is not world readable, you should reset the perms:"
 		ewarn "chmod 755 /var/run/nscd"
@@ -46,15 +46,18 @@ start() {
 		done < /etc/nsswitch.conf`
 	local pidfile="$(strings /usr/sbin/nscd | grep nscd.pid)"
 	mkdir -p "$(dirname ${pidfile})"
+	save_options pidfile "${pidfile}"
 	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/nscd --pid ${pidfile} \
+		--exec /usr/sbin/nscd --pidfile "${pidfile}" \
 		-- $secure
 	eend $?
 }
 
 stop() {
+	local pidfile="$(get_options pidfile)"
+	[ -n "${pidfile}" ] && pidfile="--pidfile ${pidfile}"
 	ebegin "Shutting down Name Service Cache Daemon"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/nscd
+	start-stop-daemon --stop --quiet --exec /usr/sbin/nscd ${pidfile}
 	eend $?
 }
 
diff --git a/hardened/toolchain/branches/pieworld/sys-libs/glibc/glibc-2.5.ebuild b/hardened/toolchain/branches/pieworld/sys-libs/glibc/glibc-2.5.ebuild
index 0d9e50a..5a03986 100644
--- a/hardened/toolchain/branches/pieworld/sys-libs/glibc/glibc-2.5.ebuild
+++ b/hardened/toolchain/branches/pieworld/sys-libs/glibc/glibc-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5.ebuild,v 1.35 2007/02/17 00:29:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5.ebuild,v 1.38 2007/03/01 02:21:06 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -16,7 +16,7 @@
 #  CHOST = CTARGET  - install into /
 #  CHOST != CTARGET - install into /usr/CTARGET/
 
-KEYWORDS="-* alpha amd64 arm ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="-* alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86"
 
 BRANCH_UPDATE=""
 
@@ -303,9 +303,9 @@ toolchain-glibc_headers_compile() {
 toolchain-glibc_src_test() {
 	cd "${WORKDIR}"/build-${ABI}-${CTARGET}-$1 || die "cd build-${ABI}-${CTARGET}-$1"
 	unset LD_ASSUME_KERNEL
-	make check && return
-	einfo "make check failed - re-running with --ignore-errors to get the rest of the results."
-	make --ignore-errors check
+	make check && return 0
+	einfo "make check failed - re-running with --keep-going to get the rest of the results."
+	make -k check
 	ewarn "make check failed for ${ABI}-${CTARGET}-$1"
 	return 1
 }
@@ -720,10 +720,6 @@ setup_flags() {
 		CBUILD_OPT=${CTARGET_OPT}
 	fi
 
-	if $(tc-getCC ${CTARGET}) -v 2>&1 | grep -q 'gcc version 3.[0123]'; then
-		append-flags -finline-limit=2000
-	fi
-
 	# Lock glibc at -O2 -- linuxthreads needs it and we want to be
 	# conservative here.  -fno-strict-aliasing is to work around #155906
 	filter-flags -O?
@@ -1184,6 +1180,8 @@ src_compile() {
 }
 
 src_test() {
+	local ret=0
+
 	setup_env
 
 	if [[ -z ${OABI} ]] && has_multilib_profile ; then
@@ -1193,20 +1191,18 @@ src_test() {
 			export ABI
 			einfo "   Testing ${ABI} glibc"
 			src_test
+			((ret+=$?))
 		done
 		ABI=${OABI}
 		unset OABI
-		return 0
+		[[ ${ret} -ne 0 ]] \
+			&& die "tests failed" \
+			|| return 0
 	fi
 
-	local ok=0
-	if want_linuxthreads; then
-		toolchain-glibc_src_test linuxthreads || ok=1
-	fi
-	if want_nptl; then
-		toolchain-glibc_src_test nptl || ok=1
-	fi
-	[[ ${ok} == "0" ]] || die "Tests did not all pass :("
+	want_linuxthreads && toolchain-glibc_src_test linuxthreads ; ((ret+=$?))
+	want_nptl && toolchain-glibc_src_test nptl ; ((ret+=$?))
+	return ${ret}
 }
 
 src_strip() {