it seems that the new SSP doesnt honor _LIBC_PROVIDES_SSP_, so i"ve included a patch that adds this functionality back in

4 files changed, 43 insertions, 5 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 7a6683aa3664..863b78fb82b7 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.242 2004/05/12 18:14:21 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.243 2004/05/13 11:46:36 lv Exp $
+
+  13 May 2004; Travis Tilley <lv@gentoo.org>
+  +files/3.4.0/gcc-3.4.0-move-propolice-into-glibc.patch, gcc-3.4.0-r2.ebuild:
+  it seems that the new SSP doesnt honor _LIBC_PROVIDES_SSP_, so i've included a
+  patch that adds this functionality back in
 
 *gcc-3.4.0-r2 (12 May 2004)
 
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 59c94cecc645..20c5f7471c4b 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -7,7 +7,7 @@ MD5 a6dd62d4bac8bd5630f21e56dbe5919c gcc-3.3.3_pre20040130.ebuild 21520
 MD5 dc586211fcb550a333b881432d652b3d gcc-3.3.3_pre20040408-r1.ebuild 22692
 MD5 8a2d0081e6c0f75912849fbb37f3c531 gcc-3.2.2-r2.ebuild 15862
 MD5 bdaadd8732e58e8c60242fcddc6cfaa5 gcc-3.3.ebuild 16663
-MD5 c79252a209a1034489fb28cacd0d54b8 gcc-3.4.0-r2.ebuild 29369
+MD5 1b429f23d3f789af2760af8837c1f6b0 gcc-3.4.0-r2.ebuild 29376
 MD5 42871c605b839610632d237b41e38866 gcc-3.3.2-r5.ebuild 21460
 MD5 7eb36ba5811423e02b4ae4c11d8869c5 gcc-3.3.3_pre20040215.ebuild 22195
 MD5 d8d35a54609911a201727872dc3ffe26 gcc-3.3.3_pre20040322.ebuild 22621
@@ -26,7 +26,7 @@ MD5 c7e55fc7f4bfd637f45786c0c5fbb365 gcc-2.95.3-r8.ebuild 9095
 MD5 b5f1d4d71ad38c5c5e489466ac0ad399 gcc-3.3.3-r3.ebuild 24690
 MD5 9fb6a5505f97c736a3f40f84ea9c71da gcc-3.3.2-r6.ebuild 21217
 MD5 e6ead3ed008a1fe7adc73ddae996ade3 gcc-3.3.2-r1.ebuild 17965
-MD5 6757bed004d3584b4f7dabdc69e615d7 ChangeLog 49841
+MD5 8dee6ee68115945031741b3699c8c083 ChangeLog 50092
 MD5 f00b83c775e21267dcfc5c57412dc961 gcc-3.3.2.ebuild 17908
 MD5 3b2fd4637666e71aae9954782cd23016 gcc-3.3.3_pre20040426.ebuild 22633
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
@@ -150,4 +150,5 @@ MD5 ff6d7b5082c5e39fab8a5d8932c1a8b7 files/3.3.3/gcc-3.3.3-uclibc-add-ssp.patch
 MD5 4b249bff27ab6328436e6289ac9f9cfc files/3.3.3/gcc333_pre20040215-gentoo-branding.patch 839
 MD5 3210d5fd70806c44d4426c3dceebd480 files/3.3.3/gcc333_pre20040408-stack-size.patch 653
 MD5 fbab4a9c4c8a8b2f329b02ee9b97fa6f files/3.4.0/gcc-3.4.0-gentoo-branding.patch 759
+MD5 66edf32babf498517ca56fa44c901f26 files/3.4.0/gcc-3.4.0-move-propolice-into-glibc.patch 894
 MD5 c89b605fe512439cf492c1c378226c7c files/3.4.0/gcc-3.4.0-fno-for-scope.patch 1604
diff --git a/sys-devel/gcc/files/3.4.0/gcc-3.4.0-move-propolice-into-glibc.patch b/sys-devel/gcc/files/3.4.0/gcc-3.4.0-move-propolice-into-glibc.patch
new file mode 100644
index 000000000000..0e8cca960112
--- /dev/null
+++ b/sys-devel/gcc/files/3.4.0/gcc-3.4.0-move-propolice-into-glibc.patch
@@ -0,0 +1,32 @@
+diff -urdN gcc-3.4.0.old/gcc/libgcc-std.ver gcc-3.4.0/gcc/libgcc-std.ver
+--- gcc-3.4.0.old/gcc/libgcc-std.ver	2004-05-13 02:41:39.633595352 -0400
++++ gcc-3.4.0/gcc/libgcc-std.ver	2004-05-13 02:46:04.836278416 -0400
+@@ -175,9 +175,11 @@
+   _Unwind_SjLj_ForcedUnwind
+   _Unwind_SjLj_Resume
+ 
++%if !defined(_LIBC_PROVIDES_SSP_)
+   # stack smash handler symbols
+   __guard
+   __stack_smash_handler
++%endif
+ }
+ 
+ %inherit GCC_3.3 GCC_3.0
+diff -urdN gcc-3.4.0.old/gcc/libgcc2.c gcc-3.4.0/gcc/libgcc2.c
+--- gcc-3.4.0.old/gcc/libgcc2.c	2004-05-13 02:41:32.928614664 -0400
++++ gcc-3.4.0/gcc/libgcc2.c	2004-05-13 02:48:49.101306336 -0400
+@@ -1669,6 +1669,7 @@
+ 
+ 
+ #ifdef L_stack_smash_handler
++#ifndef _LIBC_PROVIDES_SSP_
+ #include <stdio.h>
+ #include <string.h>
+ #include <fcntl.h>
+@@ -1784,4 +1785,5 @@
+ #endif
+   _exit (127);
+ }
++#endif /* _LIBC_PROVIDES_SSP_ */
+ #endif /* L_stack_smash_handler */
diff --git a/sys-devel/gcc/gcc-3.4.0-r2.ebuild b/sys-devel/gcc/gcc-3.4.0-r2.ebuild
index 74d5f3a6fa75..c5610f590c11 100644
--- a/sys-devel/gcc/gcc-3.4.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.4.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.0-r2.ebuild,v 1.2 2004/05/13 07:52:25 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.0-r2.ebuild,v 1.3 2004/05/13 11:46:36 lv Exp $
 
 IUSE="static nls bootstrap java build X multilib gcj f77 objc hardened uclibc"
 
@@ -301,7 +301,6 @@ src_unpack() {
 	# known to be broken are going to be compiled.
 	# Travis Tilley <lv@gentoo.org>
 	use amd64 && use multilib && die "multilib support will not compile yet with gcc 3.4.0. re-emerge with USE=-multilib"
-	die "SSP is screwed up at the moment, gimme a few to fix it"
 
 	local release_version="Gentoo Linux ${PVR}"
 
@@ -398,6 +397,7 @@ src_unpack() {
 		cp ${WORKDIR}/gcc/protector.c ${WORKDIR}/${P}/gcc/ || die "protector.c not found"
 		cp ${WORKDIR}/gcc/protector.h ${WORKDIR}/${P}/gcc/ || die "protector.h not found"
 		cp -R ${WORKDIR}/gcc/testsuite/* ${WORKDIR}/${P}/gcc/testsuite/ || die "testsuite not found"
+		epatch ${FILESDIR}/3.4.0/gcc-3.4.0-move-propolice-into-glibc.patch
 
 		#use uclibc && epatch ${FILESDIR}/3.3.3/gcc-3.3.3-uclibc-add-ssp.patch