Fix building with -Wl,--as-needed wrt #325969 by Christian Faulhammer.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 27 insertions, 14 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/Manifest b/dev-lang/erlang/Manifest
index a67768e36443..3dfaa5e06113 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50erlang-gentoo.el 134 RMD160 a453ad18f47d20e5ea5ecd1f4e4054d00eab5c35 SHA1 7c17979f533654ef05bbfcc8ae30554e7843923b SHA256 97e1da82cae31a554134d7370739520e4c67b2544e5a13f887651a62e710b4d4
+AUX erlang-14.1-lm.patch 617 RMD160 dddc049759b3e4a8af38755e9b5f0218a761b035 SHA1 f22b19b0b5aca97405bb9015c7c4b4448201e0a5 SHA256 fa58aeb0482b8c20f662eeb4d015cdeb5315b74fe8130a3e54fdab6e1c3fd0d7
 DIST otp_doc_html_R13B04.tar.gz 27440785 RMD160 7257fad19ecfeee69b1c7021692374d1e29aba79 SHA1 dc0e68cb1dd6f45cbd5ea792260b16f91eaa0e2f SHA256 fdad0db55ab9339703e7cd61626b5cca95f187084d1dabf07ac97f528b4f47aa
 DIST otp_doc_html_R14A.tar.gz 27687699 RMD160 b59262b97dd5d42c660413c18f396230d424e644 SHA1 478a80fb4ed9747efbdb2925ff46ee2809ba5340 SHA256 31cef233a9a368b5d70cb965828a221f4f911ebaddfe85f0ee84f1118c9cfabd
 DIST otp_doc_man_R13B04.tar.gz 1033584 RMD160 3046e54a71bf6e114c9208f263caef831782d090 SHA1 660e52302d270138f8e9f2f2b6a562026998012c SHA256 3646198b64bbea0f3760987d20d3392b0b5b2955394a917b92a2c6664a310dd6
@@ -9,13 +7,6 @@ DIST otp_doc_man_R14A.tar.gz 1062020 RMD160 699afefd28ffa12938dcdde6f98aa23290ad
 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 4944 RMD160 ff7e9d338d7ee11ca70f8a1793a0019fd38bf6fa SHA1 0a4234d2f0237ebd2b2c5336420ec759295b7694 SHA256 bdea59dba0cccbec5ce79d663063f30c21292c94056989c7d6780607c404f8ee
-EBUILD erlang-14.1.ebuild 4945 RMD160 c36a42ef825f1050d2dbfec488b82074dff1cef8 SHA1 2ba104aa8626a01e2a93984c4e0e40da00d198ea SHA256 d91be4db673edc04da3120c9ce62d69068865f7b2879f41478ce872372bdb60d
-MISC ChangeLog 30810 RMD160 d8200fd27ec0eebd262c1063c42446f47298a12b SHA1 5b8b6532fa5ff905532e56ade1c6a32ed40d2192 SHA256 9b1ce0e3d9058853bca6d65ef27f96d08cbc348f2784bc60e4b9177dc16af5e5
+EBUILD erlang-14.1.ebuild 4987 RMD160 6655d2fb6e6a23c77dffc497fc78e7c237a703ac SHA1 b83a13582e70e2549fe540d7deafecddfa1e18c0 SHA256 e68e35e63b864cb621d4a8331b37e5e18b437626a9ae61a51f835145849970a3
+MISC ChangeLog 30993 RMD160 5f1e24fef3138838b186f691b8a646be1de66a38 SHA1 0641d1d0a068aa224e106092ebe2e214dd5bc753 SHA256 7d4e18940c42b4229aa8dace32f6ff76f2443ef998260cd08830e73cb301c655
 MISC metadata.xml 693 RMD160 6c8d43bd35549421b055b468c45f1f2e5d39357d SHA1 7c778bbc7faf1dfdc11a6155e1c525e42d63ebb5 SHA256 ee0ac0699562802a5191deaef78770c25a342875a3b363ea95a0b92da6f107e3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwohM0ACgkQNQqtfCuFnePIJwCgioFFkj2rEz95uz0zn2mSi5Gz
-HvwAoIjomvED4bQ6pLSs7OUkzV/GNVxh
-=4wgp
------END PGP SIGNATURE-----
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
+ 
+ # ----------------------------------------------------