Don't let the build system specify march and mtune so gcc 3.4 can be used. Fixes bug #304979.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 29 insertions, 8 deletions

diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog
index 673a32d4edc6..7cf2b83e5f3a 100644
--- a/dev-java/jffi/ChangeLog
+++ b/dev-java/jffi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jffi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.12 2010/04/11 09:25:50 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.13 2010/05/02 11:58:44 betelgeuse Exp $
+
+  02 May 2010; Petteri Räty <betelgeuse@gentoo.org> jffi-1.0.0.ebuild,
+  +files/1.0.0-gcc-3.4.patch:
+  Don't let the build system specify march and mtune so gcc 3.4 can be used.
+  Fixes bug #304979.
 
   11 Apr 2010; Petteri Räty <betelgeuse@gentoo.org> -jffi-0.3-r3.ebuild:
   Remove old unused slot.
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 90325fc4a46f..4085b19300f7 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -5,6 +5,7 @@ AUX 0.3-makefile-flags.patch 1081 RMD160 8882e26ed7d63ffe960e4a1b58c756fbade234c
 AUX 0.4.1-makefile-flags.patch 1004 RMD160 3e0494367fab8c4f05dfa51d3627c256bda7801d SHA1 8cdb06a1940372ea9c2d07a97bc7647f83872d15 SHA256 da66a889fa0500c1242a40cf7568b61943171d60586498cd16026081a89530bd
 AUX 0.5-makefile-flags.patch 1004 RMD160 e68949234cafde1e14a70f2a8ef394eb126bb53a SHA1 f74745b3dc41aec31732e9e70fbed0eaa4559bd9 SHA256 b8ac57a9d7474dc31d154edcfd9a081297afbb49a3b1b5c35ae60f4b1b6e0ad1
 AUX 0.6.0.2-makefile-flags.patch 1818 RMD160 8a2abc05364c2cc6adf95d6c1fad15f706c13151 SHA1 0b9c0b5a53281c283286bcc3734319b65cfe870e SHA256 29c50591f0b656184c94862fa262b273176c61c1aec40cbf5cf79c6c36fa894a
+AUX 1.0.0-gcc-3.4.patch 327 RMD160 2425bf5a97893fbb300bb0a01d86c7595acb3a31 SHA1 836da57c448cae9da015c9ac98d821b7e5d43d0e SHA256 13328b03fd69a2934f1266446b6ae62e614e112ba305d92a73008d620be52339
 AUX jffi-0.7-makefile-flags.patch 6079 RMD160 80ac08701b4d675746a635c821ba0f53c9c56f38 SHA1 b29666fa499e9f6bf7ac5b7551895a0968f60b9c SHA256 cbe88df14f6cc99367e1d5140483d4f6c0b3f057e6a8a7e6a1d15eea91f89105
 AUX jffi-1.0.0-makefile.patch 3196 RMD160 ed9ff4ca88b326c46e4b089e5f1c51fff5e65583 SHA1 71f37c938454f6d309c90338a102ca3030a5bd36 SHA256 51d5299b057924f37727baf34cf4ba8915fe967e5ad1a60e673d6c241c6c4740
 DIST jffi-0.6.0.2.tar.bz2 1855529 RMD160 be9ecd77eb17fb80c75f8dfe21f1bdd62d34596b SHA1 b957f8b52573f4e96a3c242d016cb7fc100a3399 SHA256 a2e5cd14484027807a2ab757d8010fb9903d33a4a0e5e1f045ad8de806a0cb24
@@ -13,13 +14,13 @@ DIST jffi-git-0.7_pre20100131.tgz 1484965 RMD160 8efaecd9575926e268a3b63160a196f
 EBUILD jffi-0.6.0.2-r1.ebuild 2141 RMD160 adf9806e42fe085a749aed6648fa119bdf5f6e2d SHA1 ce17b7146d6b1098106bc7a9e14d0527187c3530 SHA256 e6fa781e9156c8e8466af23430281863bc6107fe6a0dbbd647e031030b530084
 EBUILD jffi-0.6.0.2.ebuild 2001 RMD160 c451d40cb93da4761e01dd34089ba7ed8bba0f1f SHA1 25fa3f3a1cb9a3b73d283272c7023a62f767544c SHA256 df3c5514815568d8a62b2107cca68ed859b490469ec1d37573040fb6a62d0646
 EBUILD jffi-0.7_pre20100131.ebuild 2522 RMD160 c56f2129e7787fa4048b1820068a24962eb12b77 SHA1 82391a8da3233dab77d4cb78a5033575f18480b5 SHA256 4a8ebe9cc1798a108b4af14197f871c49b3f38ba60f37c8a5b7f8e103f462776
-EBUILD jffi-1.0.0.ebuild 2146 RMD160 76e3e89a68fd4bc667866ca57d52b6650ebe2c0e SHA1 50c76a186373e947c348ab7c9d0f323eebc0d7d2 SHA256 fc8be3f461e430bdf0fbf12420099f1121dd2ddffac6c77c99a24f612f6adcab
-MISC ChangeLog 2367 RMD160 5d8b70c4ed21d152b530093ddd65d43dc908fb96 SHA1 1a2af8f84f92c879e659a3172662462119138258 SHA256 9c1f42a3ffcd34df08a1118ef75cd51704df50c69bf5093daf9c332eef16a2a1
+EBUILD jffi-1.0.0.ebuild 2189 RMD160 2ec4df31b5736fe11a7fd476936811d0db3a1c68 SHA1 6e6241abce2447786d959620374b1c91925603d2 SHA256 184797ee518c4fdf947938dbe496601339cbeb8a3f2fba169c69ea124711c448
+MISC ChangeLog 2568 RMD160 f41ee456780d6dc08c928ee200d09e6c23f967e4 SHA1 7f8a8afaaa195732815ef06d587e02039fedbb03 SHA256 7c0e504a4df70ba7dbd40a35e706859bce03290d51f73d6e0342ce354b8024bb
 MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvBlbAACgkQcxLzpIGCsLQSIgCeLrgC/nfoA5nr8HPqQ9D2Bj4s
-iRgAn0DJhUnLqM1pjHLJdyihfhQG5Y/T
-=+4yH
+iEYEARECAAYFAkvdaQQACgkQcxLzpIGCsLTUgwCgjTs1cem6NceeC9BpLTcHE5Zn
+E7cAnjD2Qbz20QnnipXE7xwipX2z+PlR
+=2Z7u
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jffi/files/1.0.0-gcc-3.4.patch b/dev-java/jffi/files/1.0.0-gcc-3.4.patch
new file mode 100644
index 000000000000..fc2bd5cae10a
--- /dev/null
+++ b/dev-java/jffi/files/1.0.0-gcc-3.4.patch
@@ -0,0 +1,14 @@
+diff --git a/jni/GNUmakefile b/jni/GNUmakefile
+index 7a027af..eaba319 100755
+--- a/jni/GNUmakefile
++++ b/jni/GNUmakefile
+@@ -188,9 +188,6 @@ endif
+ 
+ ifeq ($(CPU), i386)
+   MODEL = 32
+-  ifeq ($(findstring $(OS), openbsd darwin mingw32 win32),)
+-    CFLAGS += -march=i586 -mtune=generic
+-  endif
+ endif
+ 
+ ifeq ($(CPU), amd64)
diff --git a/dev-java/jffi/jffi-1.0.0.ebuild b/dev-java/jffi/jffi-1.0.0.ebuild
index 69c001195804..af8f9cbf49f4 100644
--- a/dev-java/jffi/jffi-1.0.0.ebuild
+++ b/dev-java/jffi/jffi-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.0.0.ebuild,v 1.2 2010/03/13 22:33:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.0.0.ebuild,v 1.3 2010/05/02 11:58:44 betelgeuse Exp $
 
 # Probably best to leave the CFLAGS as they are here. See...
 # http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
@@ -38,6 +38,7 @@ java_prepare() {
 	rm -rf jni/libffi || die
 
 	epatch "${FILESDIR}/${P}-makefile.patch"
+	epatch "${FILESDIR}/1.0.0-gcc-3.4.patch"
 
 	# any better function for this, excluding get_system_arch in java-vm-2 which is incorrect to inherit ?
 	local arch=""