updated ebuild with fixes for locale-gen and nscd, changed march and mtune

Package-Manager: portage-2.1.4.4

3 files changed, 36 insertions, 14 deletions

diff --git a/sys-libs/hardened-glibc/ChangeLog b/sys-libs/hardened-glibc/ChangeLog
index 0abb7c0cafd9..0e79381de4ff 100644
--- a/sys-libs/hardened-glibc/ChangeLog
+++ b/sys-libs/hardened-glibc/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for sys-libs/hardened-glibc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/hardened-glibc/ChangeLog,v 1.2 2008/04/27 23:19:48 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/hardened-glibc/ChangeLog,v 1.3 2008/04/28 12:15:29 pappy Exp $
+
+  28 Apr 2008; <pappy@gentoo.org> hardened-glibc-2.6.1-r1.ebuild:
+  fixed built time failures and added locale-gen and nscd config files
 
   27 Apr 2008; <pappy@gentoo.org> ChangeLog:
-  hardened-glibc-2.6.1-r1.ebuild
+  added hardened-glibc-2.6.1-r1.ebuild
 
   27 Apr 2008; <pappy@gentoo.org> ChangeLog:
   these are test versions for hardened developers
diff --git a/sys-libs/hardened-glibc/Manifest b/sys-libs/hardened-glibc/Manifest
index 575087bc5472..b913075faf77 100644
--- a/sys-libs/hardened-glibc/Manifest
+++ b/sys-libs/hardened-glibc/Manifest
@@ -1,6 +1,7 @@
 DIST glibc-2.6.1-GENTOOPATCHES.patch.gz 829226 RMD160 c1a2586d3698d70d497213762e1b4612a4d2256c SHA1 4b76792d7c02809105252cba0602c8410cabef02 SHA256 3e8f2de55fd181a550da4306f21aa9387d02ee58f6fefe1dd051b5c5b4919b34
+DIST glibc-2.6.1-LOCALEGEN_NSCD.patch.gz 8354 RMD160 583781b729108718a234f1ea7b38ca84f41728b0 SHA1 c735e59c610e5e994c8543d8e5dfbfd65d2ae987 SHA256 9cfbdc04efe0437c96dd6e1066c27366cb7f17715d2a5cb945fc46ab4a881cb7
 DIST glibc-2.6.1.tar.bz2 15767401 RMD160 a58226e394780a6996d608febf5881134990919e SHA1 85573fee8d79180165e9466a1fc25133b5792190 SHA256 3ded3a3c3ba2cf02d72479a5cc0829c7c261a9d0934e49a79233de9fa276ec22
-EBUILD hardened-glibc-2.6.1-r1.ebuild 4108 RMD160 25b24283ff73c465558b0aabe88a3079fa1525df SHA1 5ac2adca04d59dd887249f4f3ba9a3bb9dbd3c4b SHA256 e2680e9c7f810d6a3def11c603cfcf90f78657c27c714f1a3fa5942f0b25652f
+EBUILD hardened-glibc-2.6.1-r1.ebuild 4768 RMD160 1405a9b2a34b3f20506a414be014855e68cf0754 SHA1 3b37317896309b081bfc451458b4d05d3530f575 SHA256 6d4dfe4a369efce030c3fd1524e0a93ed59cfc58a7a6a9d88ac8d1e31d7dddcb
 EBUILD hardened-glibc-2.6.1.ebuild 3734 RMD160 edbde93f56e5287eb48e972b13f4629bfc12bcc3 SHA1 770614adf84e12da34cb82b94a8f8207e9129540 SHA256 be4618a7174d292402a74f146368ad4c801162bb11319ea252deafb50222243d
-MISC ChangeLog 557 RMD160 e5157326ba98d1cf90357e7d4a36e6856ca67f9a SHA1 7296cb9e5a7eeba40d5d3d9215b781bc095a64e4 SHA256 3a33360957ec11f1a59615aebb915b3a40caae9dda3ae55e18ef6cfccc422bb2
+MISC ChangeLog 701 RMD160 c46bb3b0d639f2eafaabfdef651aaafba4910433 SHA1 ab21dbb0c4c92f3e9868c3008212ec0362225873 SHA256 9c90c0baa905ac02b281af7953ca4caf0c19c07f6ad501a1aa0a925bfc519c42
 MISC metadata.xml 161 RMD160 600015e5b2643ae38ea2f9e5aaff6d31d42470a8 SHA1 578b6ea4c02d377eb40ee4000df8bc3d97497f82 SHA256 f9146563cc3df2b0d02d2f554c5293d439b56a4d36bc5aed0c66aa83dfb06c2f
diff --git a/sys-libs/hardened-glibc/hardened-glibc-2.6.1-r1.ebuild b/sys-libs/hardened-glibc/hardened-glibc-2.6.1-r1.ebuild
index f27083fc67bf..919d4914bd9d 100644
--- a/sys-libs/hardened-glibc/hardened-glibc-2.6.1-r1.ebuild
+++ b/sys-libs/hardened-glibc/hardened-glibc-2.6.1-r1.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/hardened-glibc/hardened-glibc-2.6.1-r1.ebuild,v 1.3 2008/04/28 00:22:07 pappy Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/hardened-glibc/hardened-glibc-2.6.1-r1.ebuild,v 1.4 2008/04/28 12:15:29 pappy Exp $
 
 # the main installation routine and patches
 # from http://www.linuxfromscratch.org/hlfs
@@ -17,12 +15,22 @@ GNU_MIRROR="ftp://ftp.gnu.org/gnu"
 
 PATCHDIST="http://dev.gentoo.org/~pappy/dist/hardened"
 PATCHPATH="sys-libs/hardened-glibc/files/2.6.1"
-GENTOOPATCHES="glibc-2.6.1-GENTOOPATCHES.patch.gz"
+MYPATCHES="glibc-2.6.1-GENTOOPATCHES.patch.gz"
+LOCALEGEN="glibc-2.6.1-LOCALEGEN_NSCD.patch.gz"
 
+## the default upstream glibc
 SRC_URI="${SRC_URI} \
 	${GNU_MIRROR}/glibc/glibc-2.6.1.tar.bz2"
+
+## contains a jumbo file with all patches from
+## sys-libs/glibc for this particular glibc setup
 SRC_URI="${SRC_URI} \
-	${PATCHDIST}/${PATCHPATH}/${GENTOOPATCHES}"
+	${PATCHDIST}/${PATCHPATH}/${MYPATCHES}"
+
+## contains the locale-gen utility from Debian
+## taken from sys-libs/glibc
+SRC_URI="${SRC_URI} \
+	${PATCHDIST}/${PATCHPATH}/${LOCALEGEN}"
 
 LICENSE="LGPL-2"
 SLOT="1"
@@ -31,7 +39,7 @@ SLOT="1"
 ## /var/tmp/portage/sys-libs/hardened-glibc-2.6.1-r1/
 ## work/glibc-2.6.1/gentoo/locale/locale-gen does not exist
 
-KEYWORDS="-x86"
+KEYWORDS="~x86"
 IUSE=""
 
 PROVIDE="virtual/libc"
@@ -50,9 +58,12 @@ pkg_setup() {
 	# hardcoding the CHOST in this ebuild (for x86 stages)
 	export CHOST="i486-pc-linux-gnu"
 
-	# CFLAGS+="-march=i686" for undefined reference to
-	# `__sync_bool_compare_and_swap_4'
-	export CFLAGS="-O2 -pipe -march=i686"
+	# need CFLAGS+="-march=i486" for
+	# undefined reference
+	# to `__sync_bool_compare_and_swap_4'
+	# error message,
+	# lets hope mtuning for i686 cpu gives some speed
+	export CFLAGS="-O2 -pipe -march=i486 -mtune=i686 -fforce-addr"
 	export CXXFLAGS="${CFLAGS}"
 
 	export CPPFLAGS=""
@@ -72,7 +83,14 @@ pkg_setup() {
 src_compile() {
 	cd "${WORKDIR}/glibc-${PV}"
 
-	epatch "${WORKDIR}/glibc-2.6.1-GENTOOPATCHES.patch"
+	einfo "adding gentoo glibc patches"
+	patch --quiet -p1 < "${WORKDIR}/glibc-2.6.1-GENTOOPATCHES.patch" || \
+		die "gentoo patches"
+
+	# somehow epatch would not apply this :(
+	einfo "adding localegen utility and nscd files"
+	patch --quiet -p1 < "${WORKDIR}/glibc-2.6.1-LOCALEGEN_NSCD.patch" || \
+		die "localegen patch"
 
 	mkdir -p "${WORKDIR}/glibc-build"
 	cd "${WORKDIR}/glibc-build"