Removed unnecessary amd64 construct

3 files changed, 34 insertions, 29 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 958c665933ef..bdb2c63f7e91 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.198 2004/03/26 14:38:50 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.199 2004/04/04 01:37:59 avenj Exp $
+
+  03 Apr 2004; Jon Portnoy <avenj@gentoo.org> gcc-3.3.3.ebuild :
+  Yanked unnecessary amd64-related construct for finding libc.
+  Bug #46697.
 
   26 Mar 2004; Jason Wever <weeve@gentoo.org> gcc-3.3.3.ebuild:
   And on the 5th date, gcc-3.3.3 was stable for sparc, and it was good.
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index e5f71f3434be..6b59996e0e95 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,4 +1,4 @@
-MD5 ca638b38dcd5937c7e805001b1ded2e8 ChangeLog 41315
+MD5 ab865ff514bc07d8fad34e35b480870b ChangeLog 41458
 MD5 3f93a4e13d7913e457725df427af94ec gcc-2.95.3-r7.ebuild 5433
 MD5 2d45b773ad452bfebfd7c8110b29e28c gcc-2.95.3-r8.ebuild 9207
 MD5 a18ba0e1ee7104324747ea7e48bc3bde gcc-3.0.4-r6.ebuild 8734
@@ -10,25 +10,25 @@ MD5 8a2d0081e6c0f75912849fbb37f3c531 gcc-3.2.2-r2.ebuild 15862
 MD5 8c9407ec40e58c4ebeabe5ee6e93a52a gcc-3.2.2.ebuild 16096
 MD5 66c44b1d25a762f4f6635b464d0ca23d gcc-3.2.3-r2.ebuild 17322
 MD5 f1a540d73bcf0b733f61c635b51df79a gcc-3.2.3-r3.ebuild 19860
-MD5 3c7ca40df4ece3b152f88d18cfeb9d7e gcc-3.2.3-r4.ebuild 20116
 MD5 ee4c2af55e5e81b42b0246981cb7ef4d gcc-3.3-r1.ebuild 16529
 MD5 3c0d91ac99e191e0098f14b83f28ed44 gcc-3.3.1-r1.ebuild 16128
 MD5 bd281971d3658dd49f02f647b97c4eeb gcc-3.3.1-r5.ebuild 18002
 MD5 e6ead3ed008a1fe7adc73ddae996ade3 gcc-3.3.2-r1.ebuild 17965
 MD5 2091041850f831fdef34656fc3308604 gcc-3.3.2-r2.ebuild 18118
 MD5 6953c04e837c49f5f9e5f558fbbf8fbe gcc-3.3.2-r3.ebuild 20487
+MD5 f00b83c775e21267dcfc5c57412dc961 gcc-3.3.2.ebuild 17908
+MD5 bdaadd8732e58e8c60242fcddc6cfaa5 gcc-3.3.ebuild 16663
+MD5 22d9e3c49111d1b8b8ec1484732087c9 metadata.xml 259
 MD5 14cf69f1206d85356781dd2ad63eb7ca gcc-3.3.2-r4.ebuild 20741
 MD5 a4dce7a3b5d15bc0aea1112c6d22d3e1 gcc-3.3.2-r5.ebuild 21476
 MD5 9fb6a5505f97c736a3f40f84ea9c71da gcc-3.3.2-r6.ebuild 21217
+MD5 3c7ca40df4ece3b152f88d18cfeb9d7e gcc-3.2.3-r4.ebuild 20116
 MD5 21164425b8a8b9c2a229e0dc4d90d83c gcc-3.3.2-r7.ebuild 21882
-MD5 f00b83c775e21267dcfc5c57412dc961 gcc-3.3.2.ebuild 17908
-MD5 13238a4ab6042dbb0b97350e4009d5bf gcc-3.3.3-r1.ebuild 23225
-MD5 2989d94ac4a642e55bffd5ee54cf2f95 gcc-3.3.3.ebuild 21990
 MD5 a6dd62d4bac8bd5630f21e56dbe5919c gcc-3.3.3_pre20040130.ebuild 21520
+MD5 2989d94ac4a642e55bffd5ee54cf2f95 gcc-3.3.3.ebuild 21990
 MD5 7eb36ba5811423e02b4ae4c11d8869c5 gcc-3.3.3_pre20040215.ebuild 22195
+MD5 90eb448d78e17fbf952a0fa6c35c3490 gcc-3.3.3-r1.ebuild 23305
 MD5 bf7add12719601cde5aa3fd28467e033 gcc-3.3.3_pre20040322.ebuild 22622
-MD5 bdaadd8732e58e8c60242fcddc6cfaa5 gcc-3.3.ebuild 16663
-MD5 22d9e3c49111d1b8b8ec1484732087c9 metadata.xml 259
 MD5 d70bcc196f1d68275346f067efcb9373 files/cc 20
 MD5 dcf3646d19d351cc4d95a8096c6eaf58 files/cpp 20
 MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r7 64
@@ -42,7 +42,6 @@ MD5 cd99b576d23043d02ee0b47a63c0c95e files/digest-gcc-3.2.2 64
 MD5 a71b08c7e35abe2526586874801de12e files/digest-gcc-3.2.2-r2 226
 MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r2 279
 MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r3 279
-MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r4 279
 MD5 f57a9900e4d0edcae7b1e327e263d2f7 files/digest-gcc-3.3 294
 MD5 12d4b0c4fc49fad52850ab007c3c7371 files/digest-gcc-3.3-r1 353
 MD5 c850f6ba5703712442b90b2c00060a15 files/digest-gcc-3.3.1-r1 361
@@ -51,15 +50,6 @@ MD5 cf81ae4b2da79c34a005da1182c40134 files/digest-gcc-3.3.2 130
 MD5 0d86971219ddd6dcb86f032bc2b93691 files/digest-gcc-3.3.2-r1 361
 MD5 f48105f24e5c714530e66a94aa56d615 files/digest-gcc-3.3.2-r2 361
 MD5 f48105f24e5c714530e66a94aa56d615 files/digest-gcc-3.3.2-r3 361
-MD5 29b68fb9b347114baf405bf67ebca0cd files/digest-gcc-3.3.2-r4 361
-MD5 01c41c9e6857eb40d402f2acb2bd96f9 files/digest-gcc-3.3.2-r5 361
-MD5 41e5a58d926345eb32e6a2ba3ab17031 files/digest-gcc-3.3.2-r6 361
-MD5 e58b6c1f3122b79a5d0d273acc3c008c files/digest-gcc-3.3.2-r7 361
-MD5 35f63854b7b4d5ab1ed1489e517f8e24 files/digest-gcc-3.3.3 361
-MD5 6e83bfb958e1aa7564eae72b9014980f files/digest-gcc-3.3.3-r1 444
-MD5 ac529391146ca1021405f8ec7a4b0579 files/digest-gcc-3.3.3_pre20040130 138
-MD5 9996ea8d65888808363832ea1571fe0a files/digest-gcc-3.3.3_pre20040215 138
-MD5 9996ea8d65888808363832ea1571fe0a files/digest-gcc-3.3.3_pre20040322 138
 MD5 b56b1fa94f82e5c569de7677b8a485e0 files/fix_libtool_files.sh 1738
 MD5 b1a242694f56184cbcdd40ba25800d50 files/gcc-2.95.3-alpha.diff 14345
 MD5 2d5af6fe0b03d39a94cb4c4d4b03e226 files/gcc-2.95.3-atexit.diff 1731
@@ -70,10 +60,20 @@ MD5 a84561f46d573c1c835b1c4d2510cc07 files/gcc-3-deopt.patch 588
 MD5 9c13e6b0d5770979430b76c578afa22c files/gcc3-program-transform.patch 9771
 MD5 8baffb486c75efe253bd2daa88daa7d6 files/gcc331_use_multilib.amd64.patch 352
 MD5 e3193bdffb435b77a21bfb504ff6f591 files/mkinfodir 7324
-MD5 782ac9b8dbc629fe4fdfaa7744cfc004 files/scan_libgcc_linked_ssp.sh 869
-MD5 21848cde4833618f2898e7d17b75633e files/scan_libgcc_linked_ssp.txt 173
 MD5 c589fe6a54dc88cf40463cf85a32e81e files/specs-3.3-amd64-unilib 3953
 MD5 33df162e1767e168f4f39442785071af files/texinfo-4.0-no-ncurses-gentoo.diff 51748
+MD5 29b68fb9b347114baf405bf67ebca0cd files/digest-gcc-3.3.2-r4 361
+MD5 01c41c9e6857eb40d402f2acb2bd96f9 files/digest-gcc-3.3.2-r5 361
+MD5 782ac9b8dbc629fe4fdfaa7744cfc004 files/scan_libgcc_linked_ssp.sh 869
+MD5 21848cde4833618f2898e7d17b75633e files/scan_libgcc_linked_ssp.txt 173
+MD5 41e5a58d926345eb32e6a2ba3ab17031 files/digest-gcc-3.3.2-r6 361
+MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r4 279
+MD5 e58b6c1f3122b79a5d0d273acc3c008c files/digest-gcc-3.3.2-r7 361
+MD5 ac529391146ca1021405f8ec7a4b0579 files/digest-gcc-3.3.3_pre20040130 138
+MD5 35f63854b7b4d5ab1ed1489e517f8e24 files/digest-gcc-3.3.3 361
+MD5 9996ea8d65888808363832ea1571fe0a files/digest-gcc-3.3.3_pre20040215 138
+MD5 6e83bfb958e1aa7564eae72b9014980f files/digest-gcc-3.3.3-r1 444
+MD5 9996ea8d65888808363832ea1571fe0a files/digest-gcc-3.3.3_pre20040322 138
 MD5 aa7a1e8bbe618c0d88368e69caeb7653 files/3.1/gcc31-attr-visibility.patch.bz2 3671
 MD5 8b4c6af1c730dcdd843a77e8095d312b files/3.1/gcc31-attr-visibility2.patch.bz2 2341
 MD5 98f539e65ab7e21994e5d378537a5506 files/3.1/gcc31-boehm-gc-libs.patch.bz2 1921
@@ -132,11 +132,11 @@ MD5 088e0807e677010cafe4e590e8711be1 files/3.3/gcc33-no-multilib-amd64.patch 343
 MD5 453122edf63d75cca3a6c56a6dac45b0 files/3.3/gcc33-propolice-version.patch 570
 MD5 d3e53318166d71a05d2b51bd44502270 files/3.3.1/gcc331-gentoo-branding.patch 874
 MD5 b398b7415b93423ff04952c6e69bdb4d files/3.3.1/gcc331-pp-fixup.patch 407
-MD5 9e7ed6184a1cdcb69db29f1de26c2d18 files/3.3.2/gcc332-altivec-fix.patch 1607
 MD5 d9ae122db2768f8e504dfef256d4991f files/3.3.2/gcc332-gentoo-branding.patch 874
+MD5 9e7ed6184a1cdcb69db29f1de26c2d18 files/3.3.2/gcc332-altivec-fix.patch 1607
+MD5 5f465144ef81f1b7c7f6d6abe6e4c59f files/awk/fixlafiles.awk 6285
+MD5 71ad2adafb2cc70631244faca2a85c63 files/awk/scanforssp.awk 5837
 MD5 cd87c02e4896f47bf6029eef0dc29468 files/3.3.3/gcc333-gentoo-branding.patch 874
 MD5 0e8d94bbc14fbb3fbad1df4f404b39ef files/3.3.3/gcc333-ssp-3.3_7-fixup.patch 2616
 MD5 4b249bff27ab6328436e6289ac9f9cfc files/3.3.3/gcc333_pre20040215-gentoo-branding.patch 839
 MD5 f317331e0b196ca455ca9554479cd8eb files/3.3.3/gcc333_pre20040322-gentoo-branding.patch 817
-MD5 5f465144ef81f1b7c7f6d6abe6e4c59f files/awk/fixlafiles.awk 6285
-MD5 71ad2adafb2cc70631244faca2a85c63 files/awk/scanforssp.awk 5837
diff --git a/sys-devel/gcc/gcc-3.3.3-r1.ebuild b/sys-devel/gcc/gcc-3.3.3-r1.ebuild
index e5dd1a0fdad0..797cf184a19e 100644
--- a/sys-devel/gcc/gcc-3.3.3-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.3-r1.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.3.3-r1.ebuild,v 1.8 2004/03/06 17:22:47 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r1.ebuild,v 1.9 2004/04/04 01:37:59 avenj Exp $
 
 IUSE="static nls bootstrap java build X multilib nogcj hardened"
 
@@ -190,11 +190,12 @@ version_patch() {
 glibc_have_ssp() {
 	local my_libc="${ROOT}/lib/libc.so.6"
 
-	case "${ARCH}" in
-		"amd64")
-			my_libc="${ROOT}/lib64/libc.so.?"
-			;;
-	esac
+# Not necessary. lib64 is a symlink to /lib. -- avenj@gentoo.org  3 Apr 04
+#	case "${ARCH}" in
+#		"amd64")
+#			my_libc="${ROOT}/lib64/libc.so.?"
+#			;;
+#	esac
 
 	# Check for the glibc to have the __guard symbols
 	if  [ "$(readelf -s "${my_libc}" 2>/dev/null | \