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
commitd8a68f7046b06972edceec04dee700bdcd4b0389 (patch)
tree1092eeea81bf7e2ec914d01e2c2d72681951a804 /dev-lang/erlang
parentadd ~arm, bug #338289 (diff)
downloadhistorical-d8a68f7046b06972edceec04dee700bdcd4b0389.tar.gz
historical-d8a68f7046b06972edceec04dee700bdcd4b0389.tar.bz2
historical-d8a68f7046b06972edceec04dee700bdcd4b0389.zip
Make fix for bug #334155 complete
Package-Manager: portage-2.2.01.16706-prefix/cvs/Darwin powerpc
Diffstat (limited to 'dev-lang/erlang')
-rw-r--r--dev-lang/erlang/ChangeLog6
-rw-r--r--dev-lang/erlang/Manifest6
-rw-r--r--dev-lang/erlang/erlang-13.2.4.ebuild3
-rw-r--r--dev-lang/erlang/erlang-14.1.ebuild3
4 files changed, 12 insertions, 6 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/Manifest b/dev-lang/erlang/Manifest
index 532d684a03f9..7dce34ba8178 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 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
+EBUILD erlang-13.2.4.ebuild 5151 RMD160 684db020f454aa3e1c27fedb968b638ed64626e9 SHA1 80795467ae66536939a6cb3f864c607ca406d841 SHA256 0e6b377bfe0f772e5a0c1ec4a24bd69555c835763162f4006a6a6d37b9ef8b9b
+EBUILD erlang-14.1.ebuild 5262 RMD160 d679df10e6becfe40770aba18da068c6467ae3c1 SHA1 97d74a9d82cf0915458edb9c44bd0aac462d4512 SHA256 ab2a056b3212d39f47294c425cd18b30a50e98de598f59ef3a0cba97fe0abf13
+MISC ChangeLog 31406 RMD160 8a60ec66665d601f1bf57c5c4ceae956f7018ac4 SHA1 28a8e4e6fe9fe4c85e2868205eb458e8ef8dd3e0 SHA256 cd917d4699b3f13f05ea350e6fed85b2164c95ad37fc746f808ecf683d0062c4
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 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
}