sys-devel/gcc-apple-4.2.1_p5666-r2: drop depend on libstdc++-16

Closes: https://bugs.gentoo.org/537348
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian@gentoo.org>

4 files changed, 43 insertions, 21 deletions

diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest
index 209811a8489d..4448c2cba274 100644
--- a/sys-devel/gcc-apple/Manifest
+++ b/sys-devel/gcc-apple/Manifest
@@ -1,5 +1,4 @@
 DIST gcc-5666.3.tar.gz 19367320 BLAKE2B 4b64aa80daa357d1ccf4d2c6f0d06ccd9298dc388a33833c89a9e4c009353d609590a2cd476bf4b79dea8876367b32a0ce534983cfb9c18a87e73f7c59bfbec6 SHA512 31cf52a00f31bcd7c47382888152cfe9851688c8fb7b1f236197b06b8acdd96b1943d327f8fab0fd305531c99a8fbf4865b2214dc2d1a236bb8ad39f710ce931
 DIST gcc-apple-4.2.1_p5646-gfortran.patch 38284 BLAKE2B 83934d5e52a27a0db750f725c1df1e7127dca91611ae9987bf92b7e1a52af82d19f5521ed1112265c1e7f82c833dcc65aeea1ba6ff90f28107b256d40e7eb196 SHA512 94b1c7d343b780e52bbbbc213987feda7d8f7e083d7c338ab244e89e69ba5c2fc74a9695c5f38f273e4e50683ef67b4de85abd4aa0c5c2fe3a28f7bf275dbf3a
 DIST gcc-fortran-4.2.4.tar.bz2 905688 BLAKE2B 6a7e030e3261b147f5add7c8b936ecb7a7a20b99db96e957fa94591560a2e303f2cdf931ca8d73b7c29464d288d1db52c2619bbf1cce30d7326a668aab303dad SHA512 1a36587a3691b8d7ecd23938efcdfca42642b6b260a1c830f6d791bb1b8ac32953998c45d77eee2d557861d631431569503c796b61aeaea9ac5fffbce1982faa
-DIST libstdcxx-16.tar.gz 64695692 BLAKE2B 3660778be1f28761fdf93d6db77eba54836f3ed45af756786f94abc3556f2013a84af8a2585ffee16925cd84634c96196c4392a80ed7e34db6dcb8f96f979d60 SHA512 2f0e8d694aaaf94fc2a0463ebd4a5775865421dedb431a6f6f701a8d33078e768bef232f72e2cf1f8e2d278eb60ff54030f5ad22b43eb0643d49bc4717e96b05
 DIST libstdcxx-39.tar.gz 117081330 BLAKE2B 03df012edd588e27bb1e17439e1b213bbf08a9656579f4a938c3026b993158962a44660d0dd2027ad6f12aa2b0cfaa7880a0ecfbd27b2e976bba3260e56bb377 SHA512 c640292c0f371069fbb635ed0385627c8abab869db93513922e19b25886864d093eef3684c49bf1ba82325f2d1d3cd1eb382ef6ea9dee039208fe99fe8653db6
diff --git a/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-darwin8.patch b/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-darwin8.patch
new file mode 100644
index 000000000000..c89acf2c7e00
--- /dev/null
+++ b/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-darwin8.patch
@@ -0,0 +1,13 @@
+--- gcc-5666.3/gcc/libgcov.c.orig	2015-01-21 23:33:54.000000000 +0100
++++ gcc-5666.3/gcc/libgcov.c	2015-01-21 23:36:12.000000000 +0100
+@@ -36,7 +36,10 @@
+ 
+ /* APPLE LOCAL begin instant off 6414141 */
+ #if defined(__APPLE__) && !defined(__STATIC__) && !defined(__ppc__) && !defined(__ppc64__) && !defined(__arm__)
++/* no vproc.h on 10.4 and below */
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+ #include <vproc.h>
++#endif 
+ #if defined(VPROC_HAS_TRANSACTIONS)
+ vproc_transaction_t vproc_transaction_begin(vproc_t virtual_proc) __attribute__((weak));
+ void vproc_transaction_end(vproc_t virtual_proc, vproc_transaction_t handle) __attribute__((weak));
diff --git a/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-dsymutil.patch b/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-dsymutil.patch
new file mode 100644
index 000000000000..71b9241d4cb7
--- /dev/null
+++ b/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-dsymutil.patch
@@ -0,0 +1,20 @@
+Revert of dsymutil part of
+http://gcc.gnu.org/ml/gcc-patches/2006-09/msg00057.html
+See http://article.gmane.org/gmane.linux.gentoo.alt/4327
+
+--- gcc/config/darwin.hdsymutil	2015-01-21 22:22:52.000000000 +0100
++++ gcc/config/darwin.h	2015-01-21 22:42:24.000000000 +0100
+@@ -337,12 +337,7 @@
+     %{fnested-functions: -allow_stack_execute} \
+ "/* APPLE LOCAL prefer -lSystem 6645902 */"\
+     %{!nostdlib:%{!nodefaultlibs:%(link_ssp) %(link_gcc_c_sequence)}} \
+-"/* APPLE LOCAL begin mainline 4.3 2006-10-31 4370146 */"\
+-    %{!A:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} %{F*} }}}}}}}}\n\
+-%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\
+-"/* APPLE LOCAL end mainline 4.3 2006-10-31 4370146 */"\
+-    %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm: \
+-    %{g*:%{!gstabs*:%{!g0: dsymutil %{o*:%*}%{!o:a.out}}}}}}}}}}}}"
++    %{!A:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} %{F*} }}}}}}}}"
+ /* APPLE LOCAL end mainline */
+ 
+ #ifdef TARGET_SYSTEM_ROOT
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
index 9c28e39bae45..cfc119b08b11 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
@@ -10,7 +10,6 @@ APPLE_VERS="${PV/*_p/}.3"
 DESCRIPTION="Apple branch of the GNU Compiler Collection, Developer Tools 4.0"
 HOMEPAGE="https://gcc.gnu.org"
 SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE_VERS}.tar.gz
-		http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz
 		http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz
 		fortran? (
 			mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2
@@ -64,24 +63,14 @@ src_prepare() {
 		epatch "${DISTDIR}"/${PN}-4.2.1_p5646-gfortran.patch
 	fi
 
-	# move in libstdc++
-	case ${CHOST} in
-		*-darwin1*|i?86-*-darwin9|powerpc-*-darwin9)
-			LIBSTDCXX_APPLE_VERSION=39
-		;;
-		*)
-			# pre Leopard has no dtrace, which is required by 37.11 and above
-			# Leopard only has 32-bits version of dtrace
-			LIBSTDCXX_APPLE_VERSION=16
-		;;
-	esac
-	mv "${WORKDIR}"/libstdcxx-${LIBSTDCXX_APPLE_VERSION}/libstdcxx/libstdc++-v3 .
-	if [[ ${LIBSTDCXX_APPLE_VERSION} == 16 ]] ; then
-		epatch "${FILESDIR}"/libstdc++-${LIBSTDCXX_APPLE_VERSION}.patch # does it apply on 37?
-		sed -i -e 's/__block\([^_]\)/__blk\1/g' \
-			libstdc++-v3/include/ext/mt_allocator.h \
-			libstdc++-v3/src/mt_allocator.cc || die "conflict fix failed"
-	fi
+	mv "${WORKDIR}"/libstdcxx-39/libstdcxx/libstdc++-v3 .
+
+	# pre Leopard has no dtrace, which is required by 37.11 and above
+	# Leopard only has 32-bits version of dtrace
+	# So back out dtrace support on those platforms using patch
+	# thoughtfully provided by Apple.
+	[[ ${CHOST} == x86_64-apple-darwin9 || ${CHOST##*-darwin} -le 8 ]] && \
+		patch -R -p0 < "${WORKDIR}"/libstdcxx-39/patches-4.2.1/dtrace.patch
 
 	# we use our libtool
 	sed -i -e "s:/usr/bin/libtool:${EPREFIX}/usr/bin/${CTARGET}-libtool:" \
@@ -104,7 +93,7 @@ src_prepare() {
 
 	# dsymutil stuff breaks on 10.4/x86, revert it
 	[[ ${CHOST} == *86*-apple-darwin8 ]] && \
-		epatch "${FILESDIR}"/${PN}-${GCC_VERS}-dsymutil.patch
+		epatch "${FILESDIR}"/${P}-dsymutil.patch
 
 	# support OS X 10.10
 	epatch "${FILESDIR}"/${P}-darwin14.patch
@@ -130,6 +119,7 @@ src_prepare() {
 	fi
 
 	epatch "${FILESDIR}"/${P}-perl-5.18.patch
+	epatch "${FILESDIR}"/${P}-darwin8.patch
 
 	epatch "${FILESDIR}"/${PN}-4.2.1-prefix-search-dirs-r1.patch
 	eprefixify "${S}"/gcc/gcc.c