summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2010-09-30 19:23:18 +0000
committerFabian Groffen <grobian@gentoo.org>2010-09-30 19:23:18 +0000
commit31d5d30317ec8c50ce6d026b640d5950b2887dac (patch)
tree050eeb90b47f1c1945fff460eb036d2e72716c3e
parentadd ~arm, bug #338289 (diff)
downloadgentoo-2-31d5d30317ec8c50ce6d026b640d5950b2887dac.tar.gz
gentoo-2-31d5d30317ec8c50ce6d026b640d5950b2887dac.tar.bz2
gentoo-2-31d5d30317ec8c50ce6d026b640d5950b2887dac.zip
Make fix for bug #334155 complete
(Portage version: 2.2.01.16706-prefix/cvs/Darwin powerpc)
-rw-r--r--dev-lang/erlang/ChangeLog6
-rw-r--r--dev-lang/erlang/erlang-13.2.4.ebuild3
-rw-r--r--dev-lang/erlang/erlang-14.1.ebuild3
3 files changed, 9 insertions, 3 deletions
diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 24b35a43808d..9948c9184490 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.196 2010/09/30 10:55:17 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.197 2010/09/30 19:23:18 grobian Exp $
+
+ 30 Sep 2010; Fabian Groffen <grobian@gentoo.org> erlang-13.2.4.ebuild,
+ erlang-14.1.ebuild:
+ Make fix for bug #334155 complete
30 Sep 2010; Fabian Groffen <grobian@gentoo.org> erlang-13.2.4.ebuild,
erlang-14.1.ebuild:
diff --git a/dev-lang/erlang/erlang-13.2.4.ebuild b/dev-lang/erlang/erlang-13.2.4.ebuild
index 8c154cb70c59..c02ee4eb1b0b 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.11 2010/09/30 10:55:17 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.4.ebuild,v 1.12 2010/09/30 19:23:18 grobian Exp $
EAPI=3
WX_GTK_VER="2.8"
@@ -68,6 +68,7 @@ src_prepare() {
# prevent configure from injecting -m32 by default on Darwin, bug #334155
sed -i -e 's/Darwin-i386/Darwin-NO/' configure.in || die
+ sed -i -e '/\<\(LD\|C\)FLAGS="-m32/s/-m32//' erts/configure.in || die
eautoreconf
}
diff --git a/dev-lang/erlang/erlang-14.1.ebuild b/dev-lang/erlang/erlang-14.1.ebuild
index ed595006c974..aae70f09faee 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.4 2010/09/30 10:55:17 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-14.1.ebuild,v 1.5 2010/09/30 19:23:18 grobian Exp $
EAPI=3
WX_GTK_VER="2.8"
@@ -71,6 +71,7 @@ src_prepare() {
# prevent configure from injecting -m32 by default on Darwin, bug #334155
sed -i -e 's/Darwin-i386/Darwin-NO/' configure.in || die
+ sed -i -e '/\<\(LD\|C\)FLAGS="-m32/s/-m32//' erts/configure.in || die
eautoreconf
}