Prevent configure from injecting -m32 by default on Darwin, bug #334155

Package-Manager: portage-2.2.01.16706-prefix/cvs/Darwin powerpc

4 files changed, 17 insertions, 6 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 6eb9a80166b5..24b35a43808d 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.195 2010/07/03 07:02:42 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.196 2010/09/30 10:55:17 grobian Exp $
+
+  30 Sep 2010; Fabian Groffen <grobian@gentoo.org> erlang-13.2.4.ebuild,
+  erlang-14.1.ebuild:
+  Prevent configure from injecting -m32 by default on Darwin, bug #334155
 
   03 Jul 2010; Christian Faulhammer <fauli@gentoo.org> erlang-14.1.ebuild:
   add comment about upstreamed patch
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 05b187e51e21..532d684a03f9 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -6,7 +6,7 @@ DIST otp_doc_man_R13B04.tar.gz 1033584 RMD160 3046e54a71bf6e114c9208f263caef8317
 DIST otp_doc_man_R14A.tar.gz 1062020 RMD160 699afefd28ffa12938dcdde6f98aa23290adf7b3 SHA1 320c95a73fe4ec8e42d2ea29de5562a1be8c1c50 SHA256 18a9445fcdefe9828796397cb863afe03519b5874df515bf2ad3e451d70395dc
 DIST otp_src_R13B04.tar.gz 59060560 RMD160 5546431e710814da2089d70d5d02c658a1a2f79b SHA1 fe785833a8029cbb3aee188bdb417f4da33fbd06 SHA256 e2694383b3857f5edfc242b8c3acbfba4683e448387fa124d8e587cba234af43
 DIST otp_src_R14A.tar.gz 59641065 RMD160 9b2ad4e2d0c007a4776ea8e5cc8d344107e51dd5 SHA1 286bad025985f5c6b9761cf05c0b6b68f7cb1874 SHA256 e3446a14ad60b997e27cff99b4eeedb28b840c0bd5a9da9ee57d05aacc2d169c
-EBUILD erlang-13.2.4.ebuild 4944 RMD160 ff7e9d338d7ee11ca70f8a1793a0019fd38bf6fa SHA1 0a4234d2f0237ebd2b2c5336420ec759295b7694 SHA256 bdea59dba0cccbec5ce79d663063f30c21292c94056989c7d6780607c404f8ee
-EBUILD erlang-14.1.ebuild 5055 RMD160 77bd14e590eec70ff95d40ccc04b92a651078978 SHA1 505ad91124c215d6f5d5f38f6e2fd0d8660087ef SHA256 019ed0d7847fb94bae13d8e7889b92b447d852e8e1c0822c112680cb5b9d057e
-MISC ChangeLog 31102 RMD160 4bb4a96ae70ec8300044c09b2ff53f057c416ac6 SHA1 a2b0807836378e60081d80055fd4ca646e0cd874 SHA256 8c917f01186634e91e1199d8f5aeb5bb71589b95990e2a022db779a17b213bc0
+EBUILD erlang-13.2.4.ebuild 5080 RMD160 3d2697027b9eea07ea15a794bb498e5f1b0f8cce SHA1 ca93d19c582fcf230c5981455f9b53e8af72a6d3 SHA256 d7c98c09f843f09309e7cc0438d979b4679d16832715b983981759cbe5cb7d7c
+EBUILD erlang-14.1.ebuild 5191 RMD160 4626e7f7fa220fb0fce1f9a002294ff184342a8a SHA1 c2e0a74929f221a96615739ce737b11a943fc8a7 SHA256 8ebbf26f531486537b174a17112e0be3accfb7df1cd3242ea6256e7b58945c15
+MISC ChangeLog 31274 RMD160 6e97d4662992ca479011f8d5c55fef721408a04f SHA1 e3dd5b0fc4e0b51c3cb7d7116459b398f5ea7460 SHA256 d0ab5a042334be84019a465fedb37805095341bf6aecbc49da3fc8f5cadf28a6
 MISC metadata.xml 693 RMD160 6c8d43bd35549421b055b468c45f1f2e5d39357d SHA1 7c778bbc7faf1dfdc11a6155e1c525e42d63ebb5 SHA256 ee0ac0699562802a5191deaef78770c25a342875a3b363ea95a0b92da6f107e3
diff --git a/dev-lang/erlang/erlang-13.2.4.ebuild b/dev-lang/erlang/erlang-13.2.4.ebuild
index 8e17228e4005..8c154cb70c59 100644
--- a/dev-lang/erlang/erlang-13.2.4.ebuild
+++ b/dev-lang/erlang/erlang-13.2.4.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-lang/erlang/erlang-13.2.4.ebuild,v 1.10 2010/06/26 14:59:05 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.4.ebuild,v 1.11 2010/09/30 10:55:17 grobian Exp $
 
 EAPI=3
 WX_GTK_VER="2.8"
@@ -65,6 +65,10 @@ src_prepare() {
 		ewarn "Don't cry, don't file bugs, just disable it! If you have a fix, tell us though on Bugzilla."
 		ewarn
 	fi
+
+	# prevent configure from injecting -m32 by default on Darwin, bug #334155
+	sed -i -e 's/Darwin-i386/Darwin-NO/' configure.in || die
+
 	eautoreconf
 }
 
diff --git a/dev-lang/erlang/erlang-14.1.ebuild b/dev-lang/erlang/erlang-14.1.ebuild
index 1560549e4b96..ed595006c974 100644
--- a/dev-lang/erlang/erlang-14.1.ebuild
+++ b/dev-lang/erlang/erlang-14.1.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-lang/erlang/erlang-14.1.ebuild,v 1.3 2010/07/03 07:02:42 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-14.1.ebuild,v 1.4 2010/09/30 10:55:17 grobian Exp $
 
 EAPI=3
 WX_GTK_VER="2.8"
@@ -69,6 +69,9 @@ src_prepare() {
 	# fixes as-needed issues and has been incorporated for 14A by upstream
 	epatch "${FILESDIR}"/${P}-lm.patch
 
+	# prevent configure from injecting -m32 by default on Darwin, bug #334155
+	sed -i -e 's/Darwin-i386/Darwin-NO/' configure.in || die
+
 	eautoreconf
 }