Revbump for patch from Heiko Przybyl to accept -arch argument to gcc if it matches the toolchain default target

Package-Manager: portage-2.2.01.20430-prefix/cvs/Darwin i386

4 files changed, 81 insertions, 10 deletions

diff --git a/sys-devel/gcc-apple/ChangeLog b/sys-devel/gcc-apple/ChangeLog
index f98dfd60115e..fa965845f19a 100644
--- a/sys-devel/gcc-apple/ChangeLog
+++ b/sys-devel/gcc-apple/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/gcc-apple
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.21 2011/12/06 19:57:09 grobian Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.22 2012/06/11 18:06:40 grobian Exp $
+
+*gcc-apple-4.2.1_p5666-r1 (11 Jun 2012)
+
+  11 Jun 2012; Fabian Groffen <grobian@gentoo.org>
+  +files/gcc-apple-4.2.1-arch-option.patch, +gcc-apple-4.2.1_p5666-r1.ebuild,
+  -gcc-apple-4.2.1_p5666.ebuild:
+  Revbump for patch from Heiko Przybyl to accept -arch argument to gcc if it
+  matches the toolchain default target
 
   06 Dec 2011; Fabian Groffen <grobian@gentoo.org>
   gcc-apple-4.0.1_p5490-r2.ebuild, gcc-apple-4.0.1_p5493.ebuild,
diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest
index 316950bed341..df961c90b3ec 100644
--- a/sys-devel/gcc-apple/Manifest
+++ b/sys-devel/gcc-apple/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX gcc-apple-4.0.1_p5465-default-altivec.patch 1381 RMD160 e2c62e9cd060538f1ec03cef6487031e7ac88607 SHA1 01131175af3ca748494057f3660947e1d969149f SHA256 699dfea402a5a2d80f8374254a36fc7552f32b5fc25c1d15d9b88b7742874f09
+AUX gcc-apple-4.2.1-arch-option.patch 2151 RMD160 d3e6a7ab90c05ab7593a9da1bd83ba3da094ccc6 SHA1 ebd2350e58376f08505c7c68df7757d90ab4d968 SHA256 f7f7da2d46ec6dc8ab8cf8754994abf93db7a925f20f92433e2e3f0f49b15e85
 AUX gcc-apple-4.2.1-autoconf-m4-precious.patch 339 RMD160 4f200f959cddc9877e83a015e3d8b9f87329712c SHA1 be014e546b4ae6c7e523e60c59c100ab6d6571b7 SHA256 1e95837e5b60036fd8b1aad16c3b1847225320da40a3437736166a2f5bc0032a
 AUX gcc-apple-4.2.1-dsymutil.patch 853 RMD160 3e86edb057bb5a6248706a031afa56a599d4d6ef SHA1 3a2b844d68074c7c0e582eb51ddb9c5a6889a8bc SHA256 bba3d9d406afe12f1fd55f7b91ab65c07d4a1b37401d711a0ea287104aa07040
 AUX gcc-apple-4.2.1-gfortran.patch 1745 RMD160 d0adb5edc1a6805a915c36e3ae89d61f57c49a97 SHA1 e831cd60aec04c5e27752b9522df584e11da8463 SHA256 aaaaa9f95e8d9c100298ddff6b64480c73cd8463c32ab7b748780036ad508011
@@ -34,13 +35,13 @@ EBUILD gcc-apple-4.2.1_p5646.ebuild 11260 RMD160 53532473c86fa6e2644aa9f26331dda
 EBUILD gcc-apple-4.2.1_p5647.ebuild 11480 RMD160 0eaee22d76041f85ccce4e0b5db75e16d3e3b3ce SHA1 e9298aec88fec4c9aa11f42cf317e4b8c365b85f SHA256 528c49878b6c54b268513b6080214ab5dff9b30c2277392cca9a8a130bb7e4fc
 EBUILD gcc-apple-4.2.1_p5659.ebuild 11425 RMD160 df35ba3b13aa2b02d997e595294d5d391e84975b SHA1 aba7cbc4d8788a9ce2ccb4976bc182003d780194 SHA256 460dc90f4158543a9ad6de2d3725cd6b0a4c821df3530dcfacedc470f9b41a07
 EBUILD gcc-apple-4.2.1_p5664.ebuild 11425 RMD160 a7cdc224037332a2ee292c58fc24801e97efcf5b SHA1 b74d352eef5967792daf1de2f7a264f04d0ab553 SHA256 68c7ab815bd8a1bbce1868fb62e026e6efd0bf1be4b5c8225e668ca0841af9dd
-EBUILD gcc-apple-4.2.1_p5666.ebuild 11425 RMD160 a6d4cbed7c01fe417f2747c3e1eb8cd88a009e16 SHA1 8e6fb9752960b5174d9c7200afbe4dc4c5dfbcd1 SHA256 c82cdc9c58009b50cd1588938562fb8d714bb2ee6e53866c6a01344b701cf80d
-MISC ChangeLog 13009 RMD160 917841a1544925a9eb644b138e6ae0dae64056b8 SHA1 d5c476c15436c6728406028e4418baa72d4aa73a SHA256 3de1875f907ca445ee2fb91c3465af100d738481d3ea5ec00db1f64cefab6ec7
+EBUILD gcc-apple-4.2.1_p5666-r1.ebuild 11649 RMD160 003f8e2dd9d3c9cfedd5c95484ed68eaade452c8 SHA1 a0af9233405f7ef84eb637dfd79e34980aabc4a1 SHA256 017fb874cdc01e0dee7cf2fd1a28b429304babb225dea76d59413e5a6b775403
+MISC ChangeLog 13329 RMD160 e6aaf4580ae33f4bffc8b1db09e7e613f1210b1c SHA1 00266acb3aaf08105f157060b1644095fcb5523b SHA256 363b0b84babeb82e111b5df34ab0f23605ff3be7c4dcf55c6d9b483c56f247f4
 MISC metadata.xml 440 RMD160 1e6092437bb8a8de48d6679a0802489000b2ee93 SHA1 37485b6a6b03cf46be3bd4d80e809b559c13330b SHA256 fe55903cd5820f6651e134125cfc4eeadb1322a6a06e286a246ef0f70c55c517
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (Darwin)
+Version: GnuPG v2.0.19 (Darwin)
 
-iEYEARECAAYFAk7ec54ACgkQX3X2B8XHTokvBgCfUZUHEtyaxV8717VcuxN/dD/t
-zhYAnRNFVT8m/2AhytHxiHSEzNHiP96P
-=dH1W
+iEUEARECAAYFAk/WM7cACgkQX3X2B8XHTomYIACeP5sWn2En0EOC687SSpgqXjY4
+2qsAlRKvnveSxQorvZXYa1wzkc6fKQU=
+=FoXj
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-apple/files/gcc-apple-4.2.1-arch-option.patch b/sys-devel/gcc-apple/files/gcc-apple-4.2.1-arch-option.patch
new file mode 100644
index 000000000000..94abba89306c
--- /dev/null
+++ b/sys-devel/gcc-apple/files/gcc-apple-4.2.1-arch-option.patch
@@ -0,0 +1,57 @@
+Description:	Add dummy -arch option with simplistic check.
+Author:			Heiko Przybyl <zuxez@cs.tu-berlin.de>
+
+diff -pruN gcc-5664.orig/gcc/gcc.c gcc-5664/gcc/gcc.c
+--- gcc-5664.orig/gcc/gcc.c	2010-09-21 22:28:11.000000000 +0200
++++ gcc-5664/gcc/gcc.c	2010-09-21 22:28:24.000000000 +0200
+@@ -88,6 +88,8 @@ compilation is specified by a string cal
+ #include "flags.h"
+ #include "opts.h"
+ 
++#include <mach-o/arch.h>
++
+ /* By default there is no special suffix for target executables.  */
+ /* FIXME: when autoconf is fixed, remove the host check - dj */
+ #if defined(TARGET_EXECUTABLE_SUFFIX) && defined(HOST_EXECUTABLE_SUFFIX)
+--- gcc-5664/gcc/gcc.c.orig	2010-09-22 01:30:04.000000000 +0200
++++ gcc-5664/gcc/gcc.c	2010-09-22 01:36:52.000000000 +0200
+@@ -1401,6 +1401,39 @@ translate_options (int *argcp, const cha
+ 	    nskip += 1;
+ 	  else if (! strcmp (p, "Xassembler"))
+ 	    nskip += 1;
++	  /* GENTOO_PORTAGE Allow but filter -arch. */
++	  if (! strcmp (p, "arch")) {
++		if (i + 1 == argc)
++			fatal ("argument to `-arch' is missing");
++		/* Check current arch vs. given arch if possible. */
++		const NXArchInfo *ai = NXGetLocalArchInfo();
++		if (ai) {
++			/* Returns the most generic setting */
++			/* aka "i386", "x86_64", "ppc", "ppc64", "arm". */
++			const NXArchInfo *gai = NXGetArchInfoFromCpuType(ai->cputype, CPU_SUBTYPE_MULTIPLE);
++			if (gai) {
++				const char *name = gai->name;
++#ifdef __LP64__
++				/* Make sure x64 on 32bit kernel is set correctly. */
++				if (gai->cputype == CPU_TYPE_I386) {
++					name = "x86_64";
++				}
++				else if (gai->cputype == CPU_TYPE_POWERPC) {
++					name = "ppc64";
++				}                       
++#endif                              
++				if (strcmp(name, argv[i + 1]) != 0) {
++					fatal ("`-arch %s' does not match current compiler arch `%s'",
++						argv[i + 1], name);
++				}                       
++			}                           
++		}                               
++
++		/* Skip argument. */
++		i += 2;
++		/* Don't add option to the new env. */
++		nskip = 0;
++	  }
+ 
+ 	  /* Watch out for an option at the end of the command line that
+ 	     is missing arguments, and avoid skipping past the end of the
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild
index 59b282a26105..f7e11b09e370 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666.ebuild,v 1.3 2011/12/06 19:57:09 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild,v 1.1 2012/06/11 18:06:40 grobian Exp $
 
 EAPI="3"
 
@@ -99,8 +99,13 @@ src_prepare() {
 	sed -i -e "s:tail +16c:tail -c +16:g" \
 		gcc/Makefile.in || die "sed gcc/Makefile.in failed."
 
+	# default to AltiVec on PPC, like for older releases
 	epatch "${FILESDIR}"/${PN}-4.0.1_p5465-default-altivec.patch
 
+	# support -arch XXX if XXX is actually what the toolchain targets because
+	# some upstreams insist on setting it
+	epatch "${FILESDIR}"/${PN}-4.2.1-arch-option.patch
+
 	# dsymutil stuff breaks on 10.4/x86, revert it
 	[[ ${CHOST} == *86*-apple-darwin8 ]] && \
 		epatch "${FILESDIR}"/${PN}-${GCC_VERS}-dsymutil.patch