summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-06-30 07:41:13 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-06-30 07:41:13 +0000
commit2eeb0763572e3126a44fd42964ed4f96b38c5773 (patch)
tree675362af5a880b8160038fa02db142df98774644 /dev-lang
parentCPOL license added, thanks Johann Schmitz providing the html2txt conversion (diff)
downloadgentoo-2-2eeb0763572e3126a44fd42964ed4f96b38c5773.tar.gz
gentoo-2-2eeb0763572e3126a44fd42964ed4f96b38c5773.tar.bz2
gentoo-2-2eeb0763572e3126a44fd42964ed4f96b38c5773.zip
Fix building with -Wl,--as-needed wrt #325969 by Christian Faulhammer.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/erlang/ChangeLog6
-rw-r--r--dev-lang/erlang/erlang-14.1.ebuild5
-rw-r--r--dev-lang/erlang/files/erlang-14.1-lm.patch15
3 files changed, 24 insertions, 2 deletions
diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 41497477cb68..d41aeb5bb1bc 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.193 2010/06/28 11:16:25 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.194 2010/06/30 07:41:13 ssuominen Exp $
+
+ 30 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> erlang-14.1.ebuild,
+ +files/erlang-14.1-lm.patch:
+ Fix building with -Wl,--as-needed wrt #325969 by Christian Faulhammer.
*erlang-14.1 (28 Jun 2010)
diff --git a/dev-lang/erlang/erlang-14.1.ebuild b/dev-lang/erlang/erlang-14.1.ebuild
index cff0decb71c4..ac1731ed2930 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.1 2010/06/28 11:16:25 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-14.1.ebuild,v 1.2 2010/06/30 07:41:13 ssuominen Exp $
EAPI=3
WX_GTK_VER="2.8"
@@ -65,6 +65,9 @@ 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
+
+ epatch "${FILESDIR}"/${P}-lm.patch
+
eautoreconf
}
diff --git a/dev-lang/erlang/files/erlang-14.1-lm.patch b/dev-lang/erlang/files/erlang-14.1-lm.patch
new file mode 100644
index 000000000000..2678bc4c7543
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-14.1-lm.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/325969
+
+erl_printf_format.c:(.text+0xa3e): undefined reference to `log10'
+
+--- erts/etc/common/Makefile.in
++++ erts/etc/common/Makefile.in
+@@ -98,7 +98,7 @@
+ ifeq ($(TARGET),win32)
+ ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal_r$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@
+ else
+-ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@
++ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@ -lm
+ endif
+
+ # ----------------------------------------------------