Restore libstdc++_pic.a patch (for uClibc); updated in line with current CVS

svn path=/; revision=154

4 files changed, 20 insertions, 17 deletions

diff --git a/hardened/toolchain/branches/pieworld/sys-devel/gcc/Manifest b/hardened/toolchain/branches/pieworld/sys-devel/gcc/Manifest
index fde3f60..b6fc1a7 100644
--- a/hardened/toolchain/branches/pieworld/sys-devel/gcc/Manifest
+++ b/hardened/toolchain/branches/pieworld/sys-devel/gcc/Manifest
@@ -156,10 +156,10 @@ EBUILD gcc-3.4.6-r3.ebuild 5025 RMD160 2058cb7bcf3a63d0676584cae76081161d03ea2e
 MD5 e7e1819986cf0ecdffbb5f1f59ba6b16 gcc-3.4.6-r3.ebuild 5025
 RMD160 2058cb7bcf3a63d0676584cae76081161d03ea2e gcc-3.4.6-r3.ebuild 5025
 SHA256 51a5e8aa4e23fea87d17508638016a7651961d4bffd0cd15335f1ce493c206e3 gcc-3.4.6-r3.ebuild 5025
-EBUILD gcc-4.1.1-r3.ebuild 3104 RMD160 498e72f33b3b60cca043a18a9c652ee3ecea2403 SHA1 27fa5993d19f538012c5641c37423e048ab951dc SHA256 f72f995d66be97dac992417906370b9a527c234ed94dbd2af974adc774b3b3e7
-MD5 b42a935d33bf3e8c0bdc425a647c44e9 gcc-4.1.1-r3.ebuild 3104
-RMD160 498e72f33b3b60cca043a18a9c652ee3ecea2403 gcc-4.1.1-r3.ebuild 3104
-SHA256 f72f995d66be97dac992417906370b9a527c234ed94dbd2af974adc774b3b3e7 gcc-4.1.1-r3.ebuild 3104
+EBUILD gcc-4.1.1-r3.ebuild 3238 RMD160 f1f0d9a8b8cf66067fff3cb1fcd617923916d8d2 SHA1 ac837101c1ccac4cc6fa7025cf9e6ea5c9e30282 SHA256 a5ba773961619a639767f8f695c21885a96b1b828924891c8711e8b504eee668
+MD5 d43698f73587e2c7e27c8772efc5f6b1 gcc-4.1.1-r3.ebuild 3238
+RMD160 f1f0d9a8b8cf66067fff3cb1fcd617923916d8d2 gcc-4.1.1-r3.ebuild 3238
+SHA256 a5ba773961619a639767f8f695c21885a96b1b828924891c8711e8b504eee668 gcc-4.1.1-r3.ebuild 3238
 MD5 f2ae42150d118fee847851b13498c67d files/digest-gcc-3.4.6-r3 1623
 RMD160 61cd90be115485be70bc0c6511848949fd86e3ff files/digest-gcc-3.4.6-r3 1623
 SHA256 fb9bc05b7f310a0ce63c7538d07315a3432bced82fc26c656e9ec0d843df2468 files/digest-gcc-3.4.6-r3 1623
diff --git a/hardened/toolchain/branches/pieworld/sys-devel/gcc/gcc-4.1.1-r3.ebuild b/hardened/toolchain/branches/pieworld/sys-devel/gcc/gcc-4.1.1-r3.ebuild
index d13dfc4..e101f0c 100644
--- a/hardened/toolchain/branches/pieworld/sys-devel/gcc/gcc-4.1.1-r3.ebuild
+++ b/hardened/toolchain/branches/pieworld/sys-devel/gcc/gcc-4.1.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.1-r3.ebuild,v 1.3 2006/12/26 21:37:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.1-r3.ebuild,v 1.9 2007/01/18 05:13:02 vapier Exp $
 
 PATCH_VER="1.9"
 UCLIBC_VER="1.1"
@@ -26,9 +26,10 @@ SSP_UCLIBC_UNSUPPORTED="${SSP_UNSUPPORTED}"
 PIE_UCLIBC_UNSUPPORTED="alpha amd64 arm hppa ia64 m68k ppc64 s390 sh sparc"
 PIE_GLIBC_UNSUPPORTED="hppa"
 
-# These patches are obsoleted by stricter control over how one builds a hardened
-# compiler from a vanilla compiler
-GENTOO_PATCH_EXCLUDE="54_all_300-libstdc++-pic.patch 51_all_gcc-3.4-libiberty-pic.patch"
+# This patch is obsoleted by stricter control over how one builds a hardened
+# compiler from a vanilla compiler - by forbidding changing from normal to
+# hardened between stages, this is no longer necessary.
+GENTOO_PATCH_EXCLUDE="51_all_gcc-3.4-libiberty-pic.patch"
 
 # whether we should split out specs files for multiple {PIE,SSP}-by-default
 # and vanilla configurations.
@@ -39,7 +40,7 @@ inherit toolchain
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
 
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="-* ~alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~sparc-fbsd x86 ~x86-fbsd"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
@@ -65,6 +66,8 @@ DEPEND="${RDEPEND}
 	test? ( sys-devel/autogen dev-util/dejagnu )
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
+	ppc? ( >=${CATEGORY}/binutils-2.17 )
+	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
 PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
 if [[ ${CATEGORY} != cross-* ]] ; then
diff --git a/hardened/toolchain/branches/pieworld/sys-libs/glibc/Manifest b/hardened/toolchain/branches/pieworld/sys-libs/glibc/Manifest
index c868646..6d8399b 100644
--- a/hardened/toolchain/branches/pieworld/sys-libs/glibc/Manifest
+++ b/hardened/toolchain/branches/pieworld/sys-libs/glibc/Manifest
@@ -49,10 +49,10 @@ EBUILD glibc-2.4-r4.ebuild 40802 RMD160 1f4ea04c36389c2c48dfa2cb7182a1824bb01fff
 MD5 c14e7d61ba54fd2835f7d6b6628279bc glibc-2.4-r4.ebuild 40802
 RMD160 1f4ea04c36389c2c48dfa2cb7182a1824bb01fff glibc-2.4-r4.ebuild 40802
 SHA256 a8c15fddeb4cd64075abe4e9038a40bebf4885020805de04f08e717d55290f59 glibc-2.4-r4.ebuild 40802
-EBUILD glibc-2.5.ebuild 39020 RMD160 f1ca0d296d7afd2aacaa6a203b3adc6572ed411c SHA1 2edca624f641ad22dfede802c1e8d4c1488bae39 SHA256 b8f5ffb3fc920af2a423ac43fc2fc0766cc13c4a8c6f0ae3b83f792e0d61afab
-MD5 838b43e5a2755679f4ba6330c740bb2d glibc-2.5.ebuild 39020
-RMD160 f1ca0d296d7afd2aacaa6a203b3adc6572ed411c glibc-2.5.ebuild 39020
-SHA256 b8f5ffb3fc920af2a423ac43fc2fc0766cc13c4a8c6f0ae3b83f792e0d61afab glibc-2.5.ebuild 39020
+EBUILD glibc-2.5.ebuild 39024 RMD160 285b5c74aace97313a3cd9316b49b11ce170f7e7 SHA1 2ae02a09393e62708fe12a19907bd39de7264086 SHA256 e7d32584584c854217236fe719ccf91d304dcf1c5eb4ebf259964d41d8ab64f9
+MD5 3a202eaf82bb96c864d93bae23f652c6 glibc-2.5.ebuild 39024
+RMD160 285b5c74aace97313a3cd9316b49b11ce170f7e7 glibc-2.5.ebuild 39024
+SHA256 e7d32584584c854217236fe719ccf91d304dcf1c5eb4ebf259964d41d8ab64f9 glibc-2.5.ebuild 39024
 MD5 e6c60ddb8b06199242d294f97f01c574 files/digest-glibc-2.4-r4 1575
 RMD160 49ff56b0209067c5313646df281c408956cdaa92 files/digest-glibc-2.4-r4 1575
 SHA256 a49f96d87bda9dfbe73ac717c2a1dea7b4715c9c2e6031f404e3d7ee1209efea files/digest-glibc-2.4-r4 1575
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 f6615af..bf201df 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-2006 Gentoo Foundation
+# 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.17 2006/12/03 19:54:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5.ebuild,v 1.21 2007/01/20 11:06:23 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="-* ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86"
+KEYWORDS="-* ~amd64 arm ~ia64 ~ppc ppc64 sh ~sparc ~x86"
 
 BRANCH_UPDATE=""