diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2010-09-30 10:55:17 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-09-30 10:55:17 +0000 |
| commit | f0e3d4a124b645d01b1404ca65493fb7566d7e01 (patch) | |
| tree | 470200fac6fbba19f9d1960b027a310d582a371b | |
| parent | Respect LDFLAGS in the ebuild, switch to EAPI 2 (bug #336340). (diff) | |
| download | gentoo-2-f0e3d4a124b645d01b1404ca65493fb7566d7e01.tar.gz gentoo-2-f0e3d4a124b645d01b1404ca65493fb7566d7e01.tar.bz2 gentoo-2-f0e3d4a124b645d01b1404ca65493fb7566d7e01.zip | |
Prevent configure from injecting -m32 by default on Darwin, bug #334155
(Portage version: 2.2.01.16706-prefix/cvs/Darwin powerpc)
| -rw-r--r-- | dev-lang/erlang/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/erlang/erlang-13.2.4.ebuild | 6 | ||||
| -rw-r--r-- | dev-lang/erlang/erlang-14.1.ebuild | 5 |
3 files changed, 14 insertions, 3 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/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 } |