add back in bounds checking support and fix a silly libdir bug (70481)

3 files changed, 47 insertions, 32 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 90796d0213ae..3e1b01aed375 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.346 2004/11/08 04:37:46 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.347 2004/11/09 23:09:08 lv Exp $
+
+  09 Nov 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.3.ebuild:
+  add back in bounds checking support and fix a silly libdir bug (70481)
 
   07 Nov 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.3.ebuild:
   updated the pie patch tarball to version 8.7.6.6. this fixes a bug with
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index e9042e02e8ae..1abaf4c3aaa4 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,3 +1,4 @@
+MD5 82b01b5609a77192dd568d3eac39bf67 ChangeLog 72679
 MD5 4bcf46d8a3f5509cf09f23017408095d gcc-2.95.3-r8.ebuild 8407
 MD5 9d2f881e949534e2585b5b1e32b8edf9 gcc-3.1.1-r2.ebuild 9274
 MD5 9f2b75a5738fb492bdd6a50db9b1c8a0 gcc-3.2.3-r4.ebuild 19754
@@ -9,22 +10,21 @@ MD5 582859af3130351807d9b7bd06e8e3ab gcc-3.3.2-r4.ebuild 20663
 MD5 88b21c03e4ebacabcd50654779d5d80f gcc-3.3.2-r5.ebuild 21362
 MD5 bb25db362249d8150777b7209e7e416e gcc-3.3.2-r7.ebuild 21767
 MD5 57908f5553a649a65e751f518ce4bcf5 gcc-3.3.2.ebuild 16872
+MD5 7196ef2e21bcde2f5c7de114cfa5dfc2 gcc-3.3.3-r3.ebuild 23582
+MD5 840f9c25e867afe238633c890f8ad71a gcc-3.3.3-r5.ebuild 24366
+MD5 27d17b57206385ba96c3c319960ebfc4 gcc-3.3.3-r6.ebuild 24972
 MD5 66089d59b528c2f119a3b525b68ecbc7 gcc-3.3.3.ebuild 22304
 MD5 559569b1a6d8139511c6a01203c26c6c gcc-3.3.3_pre20040408-r1.ebuild 22613
 MD5 b0f6eef081a1732ab7dfa425897d66e3 gcc-3.3.3_pre20040426.ebuild 22555
-MD5 6d3c667669a40fff1625e7517d7e889b gcc-3.3.ebuild 16623
-MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 27d17b57206385ba96c3c319960ebfc4 gcc-3.3.3-r6.ebuild 24972
 MD5 638023a605f75bd0b58558ea92d8cff9 gcc-3.3.4-r1.ebuild 24863
-MD5 ee95564bedb8cace16469a654758fed4 gcc-3.4.1.ebuild 30323
+MD5 083cab66f461d2a9ab2054e8fa7ce28c gcc-3.3.4-r2.ebuild 24911
+MD5 6d3c667669a40fff1625e7517d7e889b gcc-3.3.ebuild 16623
 MD5 eaccd73f2955ff6549a0f6e29dded1b3 gcc-3.4.1-r2.ebuild 31259
 MD5 849d93a55dc7e809cf4e3e04b8444d95 gcc-3.4.1-r3.ebuild 31292
-MD5 0ec3ebe63079d866ebae6aa1781f2930 ChangeLog 72542
-MD5 7196ef2e21bcde2f5c7de114cfa5dfc2 gcc-3.3.3-r3.ebuild 23582
-MD5 840f9c25e867afe238633c890f8ad71a gcc-3.3.3-r5.ebuild 24366
-MD5 083cab66f461d2a9ab2054e8fa7ce28c gcc-3.3.4-r2.ebuild 24911
+MD5 ee95564bedb8cace16469a654758fed4 gcc-3.4.1.ebuild 30323
 MD5 56c9a61f1a68e1a62685ee3379d208e6 gcc-3.4.2-r2.ebuild 13478
-MD5 18dee7712729885f6ca3ef7803c203f9 gcc-3.4.3.ebuild 13037
+MD5 b41455f91b2cce1b4256ea3fd38795d7 gcc-3.4.3.ebuild 13442
+MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 f7e7042c2ddf66e344b30cbc66ebaf73 files/cc 24
 MD5 80d122265d3062847a4a1b161abe1d26 files/cpp 24
 MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r8 64
@@ -51,13 +51,13 @@ MD5 fc48a7567c14adcfeed10b5e03b4ebf6 files/digest-gcc-3.4.1 355
 MD5 c6ea8a92bac6d2638c54c011f98bc5b8 files/digest-gcc-3.4.1-r2 442
 MD5 c6ea8a92bac6d2638c54c011f98bc5b8 files/digest-gcc-3.4.1-r3 442
 MD5 69687aac826654ad375b7eae45a01e0b files/digest-gcc-3.4.2-r2 443
+MD5 a6385e1a4df2e8691fa6d1d0fcf47525 files/digest-gcc-3.4.3 357
 MD5 9bb4a999eb75c9e3eadab9aa71e91879 files/fix_libtool_files.sh 1731
 MD5 edced3dd7f4035b638bbee500bc89e7b files/gcc-spec-env.patch 791
 MD5 8baffb486c75efe253bd2daa88daa7d6 files/gcc331_use_multilib.amd64.patch 352
 MD5 e3193bdffb435b77a21bfb504ff6f591 files/mkinfodir 7324
 MD5 ea2cf3df0d89a26d5fdc1a531176e395 files/pro-police-docs.patch 3287
 MD5 07b57d62aa1a8cd4d1cd37984ebe2053 files/scan_libgcc_linked_ssp.sh 861
-MD5 a6385e1a4df2e8691fa6d1d0fcf47525 files/digest-gcc-3.4.3 357
 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 8ec9b0352d226e4693cabffe0fa5bba6 files/3.2.1/gcc31-loop-load-final-value.patch 3324
diff --git a/sys-devel/gcc/gcc-3.4.3.ebuild b/sys-devel/gcc/gcc-3.4.3.ebuild
index ff7006ae1aec..320da6529962 100644
--- a/sys-devel/gcc/gcc-3.4.3.ebuild
+++ b/sys-devel/gcc/gcc-3.4.3.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.3.ebuild,v 1.3 2004/11/08 04:37:46 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3.ebuild,v 1.4 2004/11/09 23:09:08 lv Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig toolchain
 
@@ -49,9 +49,11 @@ PIE_VER="8.7.6.6"
 PIE_CORE="gcc-3.4.0-piepatches-v${PIE_VER}.tar.bz2"
 PP_VER="3_4_3"
 PP_FVER="${PP_VER//_/.}-0"
-#HTB_VER="1.00"
+
+HTB_VER="1.00"
+HTB_GCC_VER="3.4.2"
+
 SRC_URI="$(get_gcc_src_uri)"
-S="$(gcc_get_s_dir)"
 
 ETYPE="gcc-compiler"
 
@@ -364,29 +366,39 @@ src_install() {
 	fi
 
 	# we dont want these in freaky non-versioned paths that dont ever get used
-	if [ -d ${D}/${LIBPATH}/../$(get_libdir) ] ; then
-		mv ${D}/${LIBPATH}/../$(get_libdir)/* ${D}/${LIBPATH}/
-		rm -rf ${D}/${LIBPATH}/../$(get_libdir)/
+	fix_freaky_non_versioned_library_paths_that_dont_ever_get_used 32
+	fix_freaky_non_versioned_library_paths_that_dont_ever_get_used 64
+	# and mips is just freaky in general ;p
+	fix_freaky_non_versioned_library_paths_that_dont_ever_get_used o32
+	# and finally, the non-bitdepth-or-ABI-specific freaky path
+	if [ -d ${D}/${LIBPATH}/../lib ] ; then
+		mv ${D}/${LIBPATH}/../lib/* ${D}/${LIBPATH}/
+		rm -rf ${D}/${LIBPATH}/../lib
 	fi
+}
 
-	local multilibdir=$(get_multilibdir)
-	if [ -n "${multilibdir/lib}" ] ; then
-		if [ -d ${D}/${LIBPATH}/../${multilibdir} ] ; then
-			mkdir -p ${D}/${LIBPATH}/${multilibdir/lib}/
-			mv ${D}/${LIBPATH}/../${multilibdir}/* \
-				${D}/${LIBPATH}/${multilibdir/lib}/
-			rm -rf ${D}/${LIBPATH}/../${multilibdir}/
-		fi
-		if [ -d ${D}/${LIBPATH}/../${multilibdir/lib}/ ] ; then
-			# the gcc install sometimes pulls this trick too. :|
-			mkdir -p ${D}/${LIBPATH}/${multilibdir/lib}/
-			mv ${D}/${LIBPATH}/../${multilibdir/lib}/* \
-				${D}/${LIBPATH}/${multilibdir/lib}/
-			rm -rf ${D}/${LIBPATH}/../${multilibdir/lib}/
-		fi
+fix_freaky_non_versioned_library_paths_that_dont_ever_get_used() {
+	# first the multilib case
+	if [ -d ${D}/${LIBPATH}/../$1 -a -d ${D}/${LIBPATH}/$1 ] ; then
+		mv ${D}/${LIBPATH}/../$1/* ${D}/${LIBPATH}/$1/
+		rm -rf ${D}/${LIBPATH}/../$1
+	fi
+	if [ -d ${D}/${LIBPATH}/../lib$1 -a -d ${D}/${LIBPATH}/$1 ] ; then
+		mv ${D}/${LIBPATH}/../lib$1/* ${D}/${LIBPATH}/$1/
+		rm -rf ${D}/${LIBPATH}/../lib$1
+	fi
+	# and now to fix up the non-multilib case
+	if [ -d ${D}/${LIBPATH}/../$1 -a ! -d ${D}/${LIBPATH}/$1 ] ; then
+		mv ${D}/${LIBPATH}/../$1/* ${D}/${LIBPATH}/
+		rm -rf ${D}/${LIBPATH}/../$1
+	fi
+	if [ -d ${D}/${LIBPATH}/../lib$1 -a ! -d ${D}/${LIBPATH}/$1 ] ; then
+		mv ${D}/${LIBPATH}/../lib$1/* ${D}/${LIBPATH}/
+		rm -rf ${D}/${LIBPATH}/../lib$1
 	fi
 }
 
+
 pkg_preinst() {
 
 	if [ ! -f "${WORKDIR}/.chkgccversion" ]