Add a patch from Debian and the patch to prevent gcc from unlinking /dev/null.

Package-Manager: portage-2.0.51.19

4 files changed, 117 insertions, 2 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 7c8d24692074..8712d57be942 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.396 2005/04/08 02:52:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.397 2005/04/08 04:14:25 vapier Exp $
+
+*gcc-3.3.5.20050130-r2 (08 Apr 2005)
+
+  08 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +gcc-3.3.5.20050130-r2.ebuild:
+  Add a patch from Debian and the patch to prevent gcc from unlinking /dev/null.
 
 *gcc-3.4.3.20050110-r2 (08 Apr 2005)
 
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index c549fbe05ef9..dd901c2e7dfe 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,4 +1,4 @@
-MD5 f9cc09b73e57e6334eb6bc39126ae1b6 ChangeLog 82633
+MD5 fbe2a86e7db1245bec86233f941b62cf ChangeLog 82836
 MD5 32233b4175cc076b602394c34d4b4ee1 gcc-2.95.3-r8.ebuild 7485
 MD5 37f3db1694d592dc3a3db07507390b76 gcc-3.1.1-r2.ebuild 9270
 MD5 f95107278e3a6306068d0f9ef63fc5de gcc-3.2.3-r4.ebuild 19890
@@ -14,6 +14,7 @@ MD5 9e58de3f178a53783cda00f1ea56a610 gcc-3.3.5.20050130-r1.ebuild 3156
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 91b784dcd8c9ad88401b5e42a31fcd33 gcc-4.0.0_beta20050402.ebuild 1593
 MD5 edeb03d4b6d5d309f99a66b1d6fad97c gcc-3.4.3.20050110-r1.ebuild 5238
+MD5 680798d363aa7e5386c7d3eac3f1e5d3 gcc-3.3.5.20050130-r2.ebuild 3150
 MD5 f7e7042c2ddf66e344b30cbc66ebaf73 files/cc 24
 MD5 80d122265d3062847a4a1b161abe1d26 files/cpp 24
 MD5 a570da9000df56c70620ec2e36e864a3 files/digest-gcc-2.95.3-r8 137
@@ -36,6 +37,7 @@ MD5 8baffb486c75efe253bd2daa88daa7d6 files/gcc331_use_multilib.amd64.patch 352
 MD5 e3193bdffb435b77a21bfb504ff6f591 files/mkinfodir 7324
 MD5 07b57d62aa1a8cd4d1cd37984ebe2053 files/scan_libgcc_linked_ssp.sh 861
 MD5 a98425f9d4389f8df683d7f809563d8d files/digest-gcc-3.4.3.20050110-r2 616
+MD5 9e216fb231a24884fe548b31864296b8 files/digest-gcc-3.3.5.20050130-r2 620
 MD5 27120401d2355e5d959b8d2d55eba310 files/3.3.4/gcc334-gentoo-branding.patch 876
 MD5 5fb5b49f3f16cc9e7e27e582c92ffa2f files/3.3.4/libffi-without-libgcj.patch 890
 MD5 86ae592deb82c4564eb61f770fe5f8a7 files/3.4.1/gcc-3.4.1-gentoo-branding.patch 759
diff --git a/sys-devel/gcc/files/digest-gcc-3.3.5.20050130-r2 b/sys-devel/gcc/files/digest-gcc-3.3.5.20050130-r2
new file mode 100644
index 000000000000..752d65225495
--- /dev/null
+++ b/sys-devel/gcc/files/digest-gcc-3.3.5.20050130-r2
@@ -0,0 +1,8 @@
+MD5 70ee088b498741bb08c779f9617df3a5 gcc-3.3.5.tar.bz2 23833856
+MD5 a158a57134253df324270f99e5b4a612 gcc-3.3.5-branch-update-20050130.patch.bz2 38618
+MD5 407883749eddbe6baae77f722c6e77d7 protector-3.3.5.20050130-1.tar.gz 24324
+MD5 3c9f7b2bd066afe2888289595ac07104 gcc-3.3.5-uclibc-patches-1.0.tar.bz2 27532
+MD5 aa0868ecce2185884c618de9a15eb40d gcc-3.3.5-manpages.tar.bz2 214965
+MD5 c6a1161361dc8edf36204239f4079dfe gcc-3.3.5-patches-1.5.tar.bz2 43755
+MD5 9ffa098b60ba4e6eadcbbe50900fa295 gcc-3.3.5-piepatches-v8.7.7.1.tar.bz2 25970
+MD5 f75ad40c0340ff23aba1dd4961285516 bounds-checking-gcc-3.3.5-1.00-r2.patch.bz2 827126
diff --git a/sys-devel/gcc/gcc-3.3.5.20050130-r2.ebuild b/sys-devel/gcc/gcc-3.3.5.20050130-r2.ebuild
new file mode 100644
index 000000000000..53774b905d7b
--- /dev/null
+++ b/sys-devel/gcc/gcc-3.3.5.20050130-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5.20050130-r2.ebuild,v 1.1 2005/04/08 04:14:26 vapier Exp $
+
+MAN_VER="3.3.5"
+PATCH_VER="1.5"
+UCLIBC_VER="1.0"
+PIE_VER="8.7.7.1"
+PIE_CORE="gcc-3.3.5-piepatches-v${PIE_VER}.tar.bz2"
+PP_VER="3_3_5_20050130"
+PP_FVER="${PP_VER//_/.}-1"
+HTB_VER="1.00-r2"
+#HTB_GCC_VER="3.3.5"
+
+ETYPE="gcc-compiler"
+
+# arch/libc configurations known to be stable with {PIE,SSP}-by-default
+SSP_STABLE="x86 sparc amd64"
+SSP_UCLIBC_STABLE="arm mips ppc x86"
+PIE_GLIBC_STABLE="x86 sparc amd64"
+PIE_UCLIBC_STABLE="x86 mips ppc"
+
+# arch/libc configurations known to be broken with {PIE,SSP}-by-default
+SSP_UNSUPPORTED="hppa"
+SSP_UCLIBC_UNSUPPORTED="${SSP_UNSUPPORTED}"
+PIE_UCLIBC_UNSUPPORTED="alpha amd64 arm hppa ia64 m68k ppc64 s390 sh sparc"
+PIE_GLIBC_UNSUPPORTED="hppa"
+
+# whether we should split out specs files for multiple {PIE,SSP}-by-default
+# and vanilla configurations.
+SPLIT_SPECS=${SPLIT_SPECS-true}
+
+#GENTOO_PATCH_EXCLUDE=""
+#PIEPATCH_EXCLUDE=""
+
+inherit toolchain eutils
+
+DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa -ia64 ~mips ~sh ~sparc ~x86"
+
+# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
+# .eh_frame ld optimisation and symbol visibility support, but it hasnt been
+# well tested in gentoo on any arch other than amd64!!
+RDEPEND="virtual/libc
+	>=sys-devel/gcc-config-1.3.10
+	>=sys-libs/zlib-1.1.4
+	!sys-devel/hardened-gcc
+	!uclibc? ( >=sys-libs/glibc-2.3.2-r9 )
+	>=sys-devel/binutils-2.14.90.0.6-r1
+	>=sys-devel/bison-1.875
+	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
+	sparc? ( hardened? ( >=sys-libs/glibc-2.3.3.20040420 ) )
+	!build? (
+		gcj? (
+			gtk? ( >=x11-libs/gtk+-2.2 )
+			>=media-libs/libart_lgpl-2.1
+		)
+		>=sys-libs/ncurses-5.2-r2
+		nls? ( sys-devel/gettext )
+	)"
+
+if [[ ${CATEGORY/cross-} != ${CATEGORY} ]]; then
+	RDEPEND="${RDEPEND} ${CATEGORY}/binutils"
+fi
+
+DEPEND="${RDEPEND}
+	>=sys-apps/texinfo-4.2-r4
+	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
+PDEPEND="sys-devel/gcc-config"
+
+src_unpack() {
+	gcc_src_unpack
+
+	# bah
+	sed -e 's/3\.3\.6/3.3.5/' -i "${S}"/gcc/version.c
+
+	if [[ -n ${PATCH_VER} ]] && is_uclibc ; then
+		mv ${S}/gcc-3.3.2/libstdc++-v3/config/os/uclibc ${S}/libstdc++-v3/config/os/ || die
+		mv ${S}/gcc-3.3.2/libstdc++-v3/config/locale/uclibc ${S}/libstdc++-v3/config/locale/ || die
+	fi
+
+	# misc patches that havent made it into a patch tarball yet
+	epatch ${FILESDIR}/gcc-spec-env.patch
+
+	# Anything useful and objc will require libffi. Seriously. Lets just force
+	# libffi to install with USE="objc", even though it normally only installs
+	# if you attempt to build gcj.
+	if use !build && use objc && ! use gcj ; then
+		epatch ${FILESDIR}/3.3.4/libffi-without-libgcj.patch
+		#epatch ${FILESDIR}/3.4.3/libffi-nogcj-lib-path-fix.patch
+	fi
+
+	if [[ $(tc-arch) == "amd64" ]] ; then
+		replace-cpu-flags k8 i686
+		replace-cpu-flags opteron i686
+		replace-cpu-flags athlon64 i686
+	fi
+}