summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-devel/gcc/ChangeLog12
-rw-r--r--sys-devel/gcc/Manifest9
-rw-r--r--sys-devel/gcc/files/3.4.1/gcc-3.4.1-r2-gentoo-branding.patch17
-rw-r--r--sys-devel/gcc/files/digest-gcc-3.4.1-r2 (renamed from sys-devel/gcc/files/digest-gcc-3.4.1-r1)3
-rw-r--r--sys-devel/gcc/gcc-3.4.1-r2.ebuild (renamed from sys-devel/gcc/gcc-3.4.1-r1.ebuild)15
-rw-r--r--sys-devel/gcc/gcc-3.4.1.ebuild4
6 files changed, 44 insertions, 16 deletions
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 5e4191093fe7..4582ef11bf8f 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for sys-devel/gcc
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.297 2004/08/03 15:35:02 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.298 2004/08/03 18:18:57 lv Exp $
+
+*gcc-3.4.1-r2 (03 Aug 2004)
+
+ 03 Aug 2004; Travis Tilley <lv@gentoo.org>
+ +files/3.4.1/gcc-3.4.1-r2-gentoo-branding.patch, -gcc-3.4.1-r1.ebuild,
+ +gcc-3.4.1-r2.ebuild, gcc-3.4.1.ebuild:
+ new snapshot, among other things it contains an enum fix that's needed to work
+ on porting openoffice to gcc 3.4. removed the old experimental ebuild and
+ keyworded 3.4.1 stable on ppc64 since it also has the ICE fix for mozilla.
+ updated piepatch version to 8.7.6.5
03 Aug 2004; Tom Gall <tgall@gentoo.org> gcc-3.4.1-r1.ebuild:
stable on ppc64
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index da86efbfb3b1..17aaf3a7de19 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,4 +1,3 @@
-MD5 63f26e0c9d7fae451cc71ad452ea53b3 ChangeLog 61045
MD5 2d68ea9bddc5ae32edc46b93504bc677 gcc-2.95.3-r8.ebuild 8333
MD5 c2e3682e50306c3e2fad2807fe192e67 gcc-3.0.4-r6.ebuild 8454
MD5 9d2f881e949534e2585b5b1e32b8edf9 gcc-3.1.1-r2.ebuild 9274
@@ -28,9 +27,10 @@ MD5 19a295b786bcfd812e4980b975747300 gcc-3.3.4-r1.ebuild 24680
MD5 6a8dc3e137b470d3a29b05a29c958ba4 gcc-3.3.4.ebuild 24860
MD5 11018288700391792ad881e9e4d38902 gcc-3.3.ebuild 16552
MD5 e4fbc8f034af23d564dcd374231d5ae4 gcc-3.4.0-r6.ebuild 29877
-MD5 78a598c080ce53b0dec34f655fcf0a23 gcc-3.4.1-r1.ebuild 30251
-MD5 db772ba7e4910e8da59368a406f1e9c3 gcc-3.4.1.ebuild 30103
+MD5 0eb2430ce5dddecc5ea452f0c98c813e ChangeLog 61504
+MD5 4ce9f36bcbd1fc9b804ef213ff2a3768 gcc-3.4.1.ebuild 30102
MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
+MD5 835c3f9855139f9b4d0ea4fbb8ed6706 gcc-3.4.1-r2.ebuild 30243
MD5 f7e7042c2ddf66e344b30cbc66ebaf73 files/cc 24
MD5 80d122265d3062847a4a1b161abe1d26 files/cpp 24
MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r8 64
@@ -63,11 +63,11 @@ MD5 4ac72f39b294a0fc6dd74f7567604d42 files/digest-gcc-3.3.4 276
MD5 6df16eb92245a931ecfc4cbcc73c84cf files/digest-gcc-3.3.4-r1 442
MD5 651abb651e5fdcec7c83354b5742d26d files/digest-gcc-3.4.0-r6 443
MD5 fc48a7567c14adcfeed10b5e03b4ebf6 files/digest-gcc-3.4.1 355
-MD5 19ee8b939a0e177ef56e865f0dfea018 files/digest-gcc-3.4.1-r1 355
MD5 9bb4a999eb75c9e3eadab9aa71e91879 files/fix_libtool_files.sh 1731
MD5 8baffb486c75efe253bd2daa88daa7d6 files/gcc331_use_multilib.amd64.patch 352
MD5 e3193bdffb435b77a21bfb504ff6f591 files/mkinfodir 7324
MD5 07b57d62aa1a8cd4d1cd37984ebe2053 files/scan_libgcc_linked_ssp.sh 861
+MD5 c6ea8a92bac6d2638c54c011f98bc5b8 files/digest-gcc-3.4.1-r2 442
MD5 b1a242694f56184cbcdd40ba25800d50 files/2.95.3/gcc-2.95.3-alpha.diff 14345
MD5 523970c128b929fe7c7cf36508ebd1d5 files/2.95.3/gcc-2.95.3-new-atexit.diff 13604
MD5 9c13e6b0d5770979430b76c578afa22c files/3.0/gcc3-program-transform.patch 9771
@@ -123,5 +123,6 @@ MD5 bae93db3186aa0fc25d659b7799ef499 files/3.4.0/gcc34-ppc64-m32-m64-multilib-on
MD5 4edccdf0b4f6dbbc9f7bc9370c255e0c files/3.4.0/gcc34-reiser4-fix.patch 587
MD5 86ae592deb82c4564eb61f770fe5f8a7 files/3.4.1/gcc-3.4.1-gentoo-branding.patch 759
MD5 df06b1cf70425c78e2e59136ed372ab4 files/3.4.1/gcc341-ppc64-mozilla-ICE-fix.patch 729
+MD5 14fec2000fc63536d4cf22195e88e14f files/3.4.1/gcc-3.4.1-r2-gentoo-branding.patch 781
MD5 40eea3a959b76abb57fc629c029a3427 files/awk/fixlafiles.awk 7753
MD5 c672adb59a1f452475ab0a864b9d1bd1 files/awk/scanforssp.awk 5830
diff --git a/sys-devel/gcc/files/3.4.1/gcc-3.4.1-r2-gentoo-branding.patch b/sys-devel/gcc/files/3.4.1/gcc-3.4.1-r2-gentoo-branding.patch
new file mode 100644
index 000000000000..88c2cfab22a2
--- /dev/null
+++ b/sys-devel/gcc/files/3.4.1/gcc-3.4.1-r2-gentoo-branding.patch
@@ -0,0 +1,17 @@
+--- gcc/version.c.old 2004-05-20 05:20:46.352804640 -0400
++++ gcc/version.c 2004-05-20 05:23:53.833303272 -0400
+@@ -5,7 +5,7 @@
+ please modify this string to indicate that, e.g. by putting your
+ organization's name in parentheses at the end of the string. */
+
+-const char version_string[] = "3.4.2 20040803 (prerelease)";
++const char version_string[] = "3.4.1 @GENTOO@";
+
+ /* This is the location of the online document giving instructions for
+ reporting bugs. If you distribute a modified version of GCC,
+@@ -14,4 +14,4 @@
+ forward us bugs reported to you, if you determine that they are
+ not bugs in your modifications.) */
+
+-const char bug_report_url[] = "<URL:http://gcc.gnu.org/bugs.html>";
++const char bug_report_url[] = "<URL:http://bugs.gentoo.org/>";
diff --git a/sys-devel/gcc/files/digest-gcc-3.4.1-r1 b/sys-devel/gcc/files/digest-gcc-3.4.1-r2
index 0703c38152c8..5ada98933542 100644
--- a/sys-devel/gcc/files/digest-gcc-3.4.1-r1
+++ b/sys-devel/gcc/files/digest-gcc-3.4.1-r2
@@ -1,5 +1,6 @@
MD5 31b459062499f9f68d451db9cbf3205c gcc-3.4.1.tar.bz2 27182385
+MD5 029f1dde684d2f4132bc339908513451 gcc-3.4.1-branch-update-20040803.patch.bz2 220869
MD5 52bf522b3fdfb93f2e939c1b52e21590 gcc-3.4.1-patches-1.1.tar.bz2 33399
MD5 5db6cb16c361476f4bcb48df16793243 protector-3.4-2.tar.gz 31066
MD5 2764c295d8348f58defd33b7eea9d5b7 gcc-3.4.1-manpages.tar.bz2 614346
-MD5 26b4005312c1cf89a78dd6b520fc75f6 gcc-3.4.0-piepatches-v8.7.6.3.tar.bz2 16361
+MD5 c6d950e8f61cbac4590061a116669b56 gcc-3.4.0-piepatches-v8.7.6.5.tar.bz2 16392
diff --git a/sys-devel/gcc/gcc-3.4.1-r1.ebuild b/sys-devel/gcc/gcc-3.4.1-r2.ebuild
index 7995d1ebb726..2fbf67503bf6 100644
--- a/sys-devel/gcc/gcc-3.4.1-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.4.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1-r1.ebuild,v 1.6 2004/08/03 15:35:02 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1-r2.ebuild,v 1.1 2004/08/03 18:18:57 lv Exp $
IUSE="static nls bootstrap build multilib gcj gtk f77 objc hardened uclibc n32 n64"
@@ -10,8 +10,9 @@ DESCRIPTION="The GNU Compiler Collection. Includes C/C++, java compilers, pie a
HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="-* ppc64"
-#KEYWORDS="-* ~amd64 ~mips ~ppc64"
+# previous release known to b0rk glibc on hppa... i dont know if this bug
+# still exists, so i'll keep in the -hppa...
+KEYWORDS="-* ~amd64 ~mips ~ppc64 ~x86 -hppa"
# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
# we also need at least glibc 2.3.3 20040420-r1 in order for gcc 3.4 not to nuke
@@ -66,10 +67,10 @@ fi
# Branch update support ...
MAIN_BRANCH="${PV}" # Tarball, etc used ...
-BRANCH_UPDATE=
+BRANCH_UPDATE=20040803
# PIE support
-PIE_VER="8.7.6.3"
+PIE_VER="8.7.6.5"
PIE_CORE="gcc-3.4.0-piepatches-v${PIE_VER}.tar.bz2"
# ProPolice version
@@ -490,13 +491,11 @@ src_unpack() {
do_patch_tarball
do_piessp_patches
- version_patch ${FILESDIR}/3.4.1/gcc-${PV}-gentoo-branding.patch \
+ version_patch ${FILESDIR}/3.4.1/gcc-${PV}-r2-gentoo-branding.patch \
"${BRANCH_UPDATE} (${release_version})" || die "Failed Branding"
# misc patches that havent made it into a patch tarball yet
- use sparc && epatch ${FILESDIR}/3.4.0/gcc34-multi32-hack.patch
epatch ${FILESDIR}/3.4.0/gcc34-reiser4-fix.patch
- epatch ${FILESDIR}/3.4.1/gcc341-ppc64-mozilla-ICE-fix.patch
# Misdesign in libstdc++ (Redhat)
cp -a ${S}/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
diff --git a/sys-devel/gcc/gcc-3.4.1.ebuild b/sys-devel/gcc/gcc-3.4.1.ebuild
index 2dfeb25184ae..dc5d7347f87a 100644
--- a/sys-devel/gcc/gcc-3.4.1.ebuild
+++ b/sys-devel/gcc/gcc-3.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1.ebuild,v 1.14 2004/07/29 16:00:27 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1.ebuild,v 1.15 2004/08/03 18:18:57 lv Exp $
IUSE="static nls bootstrap build multilib gcj gtk f77 objc hardened uclibc n32 n64"
@@ -138,7 +138,7 @@ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="-* ~mips -hppa amd64 ~ppc64 ~x86"
+KEYWORDS="-* ~mips -hppa amd64 ppc64 ~x86"
#KEYWORDS="amd64 ~x86 ~ppc ~sparc ~mips ~ia64 ~ppc64 ~hppa ~alpha ~s390"
# Ok, this is a hairy one again, but lets assume that we