summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lang/erlang')
-rw-r--r--dev-lang/erlang/ChangeLog7
-rw-r--r--dev-lang/erlang/erlang-11.2.5-r2.ebuild12
-rw-r--r--dev-lang/erlang/files/erlang-11.2.5-hipe.patch12
3 files changed, 27 insertions, 4 deletions
diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 4799624b7ac5..95e57823aadc 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/erlang
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.76 2007/08/26 07:43:47 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.77 2007/09/23 07:34:43 opfer Exp $
+
+ 23 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
+ +files/erlang-11.2.5-hipe.patch, erlang-11.2.5-r2.ebuild:
+ add patch provided by Paul Bonser <misterpib@gmail.com> in bug193452 to
+ prevent a doubled statement in hipe installation
26 Aug 2007; Christian Faulhammer <opfer@gentoo.org>
erlang-11.2.5-r2.ebuild:
diff --git a/dev-lang/erlang/erlang-11.2.5-r2.ebuild b/dev-lang/erlang/erlang-11.2.5-r2.ebuild
index d17a630308cf..8d46d7d5bd78 100644
--- a/dev-lang/erlang/erlang-11.2.5-r2.ebuild
+++ b/dev-lang/erlang/erlang-11.2.5-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-11.2.5-r2.ebuild,v 1.5 2007/08/26 07:43:47 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-11.2.5-r2.ebuild,v 1.6 2007/09/23 07:34:43 opfer Exp $
inherit elisp-common eutils flag-o-matic multilib versionator
@@ -42,17 +42,23 @@ SITEFILE=50erlang-gentoo.el
src_unpack() {
## fix compilation on hardened systems, see bug #154338
- filter-flags "-fstack-protector"
- filter-flags "-fstack-protector-all"
+# filter-flags "-fstack-protector"
+# filter-flags "-fstack-protector-all"
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${P}-build.patch #184419
+
# needed for amd64
epatch "${FILESDIR}/${PN}-10.2.6-export-TARGET.patch"
+
# needed for FreeBSD
epatch "${FILESDIR}/${PN}-11.2.5-gethostbyname.patch"
+
+ # needed for building with hipe and recent coreutils
+ use hipe && epatch "${FILESDIR}"/${P}-hipe.patch
+
use odbc || sed -i 's: odbc : :' lib/Makefile
# make sure we only link ssl dynamically
diff --git a/dev-lang/erlang/files/erlang-11.2.5-hipe.patch b/dev-lang/erlang/files/erlang-11.2.5-hipe.patch
new file mode 100644
index 000000000000..d9399e024d9a
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-11.2.5-hipe.patch
@@ -0,0 +1,12 @@
+Fix duplicate entry in makefile
+
+--- otp_src_R11B-5.orig/lib/hipe/regalloc/Makefile 2007-09-12 12:45:03.000000000 -0600
++++ otp_src_R11B-5/lib/hipe/regalloc/Makefile 2007-09-12 12:46:01.000000000 -0600
+@@ -43,7 +43,6 @@
+ hipe_temp_map \
+ hipe_optimistic_regalloc \
+ hipe_coalescing_regalloc \
+- hipe_optimistic_regalloc \
+ hipe_graph_coloring_regalloc \
+ hipe_regalloc_loop \
+ hipe_ls_regalloc \ \ No newline at end of file