| 1 |
grobian 10/09/30 10:55:17 |
| 2 |
|
| 3 |
Modified: ChangeLog erlang-14.1.ebuild erlang-13.2.4.ebuild |
| 4 |
Log: |
| 5 |
Prevent configure from injecting -m32 by default on Darwin, bug #334155 |
| 6 |
|
| 7 |
(Portage version: 2.2.01.16706-prefix/cvs/Darwin powerpc) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.196 dev-lang/erlang/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/erlang/ChangeLog?rev=1.196&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/erlang/ChangeLog?rev=1.196&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/erlang/ChangeLog?r1=1.195&r2=1.196 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v |
| 19 |
retrieving revision 1.195 |
| 20 |
retrieving revision 1.196 |
| 21 |
diff -u -r1.195 -r1.196 |
| 22 |
--- ChangeLog 3 Jul 2010 07:02:42 -0000 1.195 |
| 23 |
+++ ChangeLog 30 Sep 2010 10:55:17 -0000 1.196 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for dev-lang/erlang |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.195 2010/07/03 07:02:42 fauli Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.196 2010/09/30 10:55:17 grobian Exp $ |
| 29 |
+ |
| 30 |
+ 30 Sep 2010; Fabian Groffen <grobian@g.o> erlang-13.2.4.ebuild, |
| 31 |
+ erlang-14.1.ebuild: |
| 32 |
+ Prevent configure from injecting -m32 by default on Darwin, bug #334155 |
| 33 |
|
| 34 |
03 Jul 2010; Christian Faulhammer <fauli@g.o> erlang-14.1.ebuild: |
| 35 |
add comment about upstreamed patch |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.4 dev-lang/erlang/erlang-14.1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/erlang/erlang-14.1.ebuild?rev=1.4&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/erlang/erlang-14.1.ebuild?rev=1.4&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/erlang/erlang-14.1.ebuild?r1=1.3&r2=1.4 |
| 44 |
|
| 45 |
Index: erlang-14.1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-14.1.ebuild,v |
| 48 |
retrieving revision 1.3 |
| 49 |
retrieving revision 1.4 |
| 50 |
diff -u -r1.3 -r1.4 |
| 51 |
--- erlang-14.1.ebuild 3 Jul 2010 07:02:42 -0000 1.3 |
| 52 |
+++ erlang-14.1.ebuild 30 Sep 2010 10:55:17 -0000 1.4 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2010 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-14.1.ebuild,v 1.3 2010/07/03 07:02:42 fauli Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-14.1.ebuild,v 1.4 2010/09/30 10:55:17 grobian Exp $ |
| 58 |
|
| 59 |
EAPI=3 |
| 60 |
WX_GTK_VER="2.8" |
| 61 |
@@ -69,6 +69,9 @@ |
| 62 |
# fixes as-needed issues and has been incorporated for 14A by upstream |
| 63 |
epatch "${FILESDIR}"/${P}-lm.patch |
| 64 |
|
| 65 |
+ # prevent configure from injecting -m32 by default on Darwin, bug #334155 |
| 66 |
+ sed -i -e 's/Darwin-i386/Darwin-NO/' configure.in || die |
| 67 |
+ |
| 68 |
eautoreconf |
| 69 |
} |
| 70 |
|
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
1.11 dev-lang/erlang/erlang-13.2.4.ebuild |
| 75 |
|
| 76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/erlang/erlang-13.2.4.ebuild?rev=1.11&view=markup |
| 77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/erlang/erlang-13.2.4.ebuild?rev=1.11&content-type=text/plain |
| 78 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/erlang/erlang-13.2.4.ebuild?r1=1.10&r2=1.11 |
| 79 |
|
| 80 |
Index: erlang-13.2.4.ebuild |
| 81 |
=================================================================== |
| 82 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.4.ebuild,v |
| 83 |
retrieving revision 1.10 |
| 84 |
retrieving revision 1.11 |
| 85 |
diff -u -r1.10 -r1.11 |
| 86 |
--- erlang-13.2.4.ebuild 26 Jun 2010 14:59:05 -0000 1.10 |
| 87 |
+++ erlang-13.2.4.ebuild 30 Sep 2010 10:55:17 -0000 1.11 |
| 88 |
@@ -1,6 +1,6 @@ |
| 89 |
# Copyright 1999-2010 Gentoo Foundation |
| 90 |
# Distributed under the terms of the GNU General Public License v2 |
| 91 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.4.ebuild,v 1.10 2010/06/26 14:59:05 nixnut Exp $ |
| 92 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.4.ebuild,v 1.11 2010/09/30 10:55:17 grobian Exp $ |
| 93 |
|
| 94 |
EAPI=3 |
| 95 |
WX_GTK_VER="2.8" |
| 96 |
@@ -65,6 +65,10 @@ |
| 97 |
ewarn "Don't cry, don't file bugs, just disable it! If you have a fix, tell us though on Bugzilla." |
| 98 |
ewarn |
| 99 |
fi |
| 100 |
+ |
| 101 |
+ # prevent configure from injecting -m32 by default on Darwin, bug #334155 |
| 102 |
+ sed -i -e 's/Darwin-i386/Darwin-NO/' configure.in || die |
| 103 |
+ |
| 104 |
eautoreconf |
| 105 |
} |
Archives