fix build failure with Glibc 2.8, see bug 226063, patch provided by Holger Hoffstätte <holger AT wizards DOT de>

Package-Manager: portage-2.1.4.4

4 files changed, 34 insertions, 4 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index adcbbef2e561..75ae319d073c 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.122 2008/06/12 20:59:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.123 2008/06/13 19:31:06 opfer Exp $
+
+  13 Jun 2008; Christian Faulhammer <opfer@gentoo.org>
+  +files/erlang-12.2.3-glibc28.patch, erlang-12.2.3.ebuild:
+  fix build failure with Glibc 2.8, see bug 226063, patch provided by Holger
+  Hoffstätte <holger AT wizards DOT de>
 
   12 Jun 2008; Brent Baude <ranger@gentoo.org> erlang-12.2.3.ebuild:
   Marking erlang-12.2.3 ~ppc64 for bug 226085
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 2015bfdc0ca1..d1b2c871fee3 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50erlang-gentoo.el 134 RMD160 a453ad18f47d20e5ea5ecd1f4e4054d00eab5c35 SHA1 7c17979f533654ef05bbfcc8ae30554e7843923b SHA256 97e1da82cae31a554134d7370739520e4c67b2544e5a13f887651a62e710b4d4
 AUX erlang-12.2.2-as-needed.patch 681 RMD160 4e296989aa03a874871bcd1be558b9b6036722ae SHA1 7d8279e19941cc381b4fa48df75596aad3a5adbe SHA256 02a58d742d273754b584e2adb6d8e97170dda98a434676b979dcbccd817eca46
+AUX erlang-12.2.3-glibc28.patch 431 RMD160 0f776b37e3d072f3a8dca72f5eb1cd0893ae522f SHA1 12bdfe823e9bae3ac40d2ee8a951b183b4b85ac8 SHA256 628038216ff9f66aad5100fa8663bc4ca229b33bd9ba952b95c64b43af1635d6
 DIST otp_doc_html_R12B-2.tar.gz 5616891 RMD160 ddceb9b20aa485d8aab9c4f43e0f33fc8ba7eb8d SHA1 9fbb1f8e514ab340fff437e794243b4d530ed682 SHA256 f169acca450eb84d58377b1fabee18268ea9cf1a59393c0b970fefdb894b771e
 DIST otp_doc_html_R12B-3.tar.gz 5655205 RMD160 8295d4e94952bad6458f2038415c474e687631cb SHA1 194003607113c84aef5b5daad7ca8b8901d1d80a SHA256 4690829f270a40d6c1849a34e9854ba4f55e1ec1a1e91dbc09e6a0a0a7228005
 DIST otp_doc_man_R12B-2.tar.gz 777982 RMD160 963eb8247ae2df39ce4f998d72893e9ff2d646a0 SHA1 c32be18cc121412af97d948e1262a185206cadcb SHA256 712140af4b49cf696f6968244e13a753cb6f53c09e46fedb8d93407bf21c95c4
@@ -7,6 +11,13 @@ DIST otp_doc_man_R12B-3.tar.gz 809746 RMD160 7e0c27391f42b1e58c7bb1472594e9fe6f7
 DIST otp_src_R12B-2.tar.gz 41190987 RMD160 14702b907c1a2cce2403e2c24db8187904039697 SHA1 a38adf0498a6d0f5038899d9f4a8accc935e7ffd SHA256 ba84af52b5ff10029a9f68c03d53c350d359ca1ed9247ac609765746692a89c1
 DIST otp_src_R12B-3.tar.gz 42195557 RMD160 e7b5da985b939e51ef4e2d19fb96cff1781ce263 SHA1 ea5f202cc35ed6ef2796727b95d62c9bbe6ad5e5 SHA256 a8ed977d468454ca8d849ee5fa08ac3d521d76f23649bef531b76bdfa73f8eb2
 EBUILD erlang-12.2.2.ebuild 4731 RMD160 9b4f5982f518e7deba8f8d02e0e3537248a8bad9 SHA1 61e28e980870c65d60279b6cb4db20e41997832a SHA256 e5bfb4cd35ab21c02a34263b8dcc78074e21beafaeb2fac1be6771d2803deffc
-EBUILD erlang-12.2.3.ebuild 4698 RMD160 22d798a15ee2f52bcbd2201ff675f516299107e8 SHA1 e16a423140749c6a7b9b7e5d0f31210816311bf4 SHA256 863974e1056bd65f9958f2a2b035c63ad91b31baf2f11ad9e1b653a7d38199aa
-MISC ChangeLog 20803 RMD160 9a1c00147e2ae1512eaa90f0c792aea3484c9ea5 SHA1 fa51a7f2614e00dcaf2b3ef20651069fd86390a3 SHA256 223bc0b14cb7d99b91b8e2df36fb1dde015699e8aa42ce8e5f55d21e95353e21
+EBUILD erlang-12.2.3.ebuild 4802 RMD160 45e0954bade9d0b3da7a3689e080fb3f33064ff2 SHA1 6eed999a4080b42ca91359c7d3407192592bc956 SHA256 d60d51e74eda308c811ebdff834aa7f887ceba642490249f32076f476e3aade4
+MISC ChangeLog 21036 RMD160 52ad8d16f4579bcf91949a939fb533909882bf44 SHA1 66a072dc3163ad995c4ce8ae3ae7e277f75a8f37 SHA256 b248e85ed5b24f28f5b74982243def827483aa30c595be7abcc736ffe93aaa65
 MISC metadata.xml 476 RMD160 da948210972738dfbd855236cecc30b22d9cdb3e SHA1 b31a990b8d57f0c32a9cccdd2c60958c1f1a847f SHA256 393328bc46a0f98b7e1be0f6b4bd2f8e3070762e23cbca17fa32f6eecd8a2af7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhSywMACgkQNQqtfCuFneNfUQCePxMX4DHhWb6LCCWSMPR7m+Bk
+P84An0iufxi/FI7aavpxmq1B2LYKx86c
+=9sxB
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-12.2.3.ebuild b/dev-lang/erlang/erlang-12.2.3.ebuild
index d1f248845574..f15c49786fd9 100644
--- a/dev-lang/erlang/erlang-12.2.3.ebuild
+++ b/dev-lang/erlang/erlang-12.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-12.2.3.ebuild,v 1.2 2008/06/12 20:59:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-12.2.3.ebuild,v 1.3 2008/06/13 19:31:06 opfer Exp $
 
 inherit autotools elisp-common eutils flag-o-matic multilib versionator
 
@@ -47,6 +47,9 @@ src_unpack() {
 
 	use odbc || sed -i 's: odbc : :' lib/Makefile
 
+	# fixes bug 226063, reported and accepted upstream for R12B-4
+	epatch "${FILESDIR}"/${P}-glibc28.patch
+
 	# make sure we only link ssl dynamically
 	# will not be integrated by upstream for various reasons
 	sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure #184419
diff --git a/dev-lang/erlang/files/erlang-12.2.3-glibc28.patch b/dev-lang/erlang/files/erlang-12.2.3-glibc28.patch
new file mode 100644
index 000000000000..d13053a8bb03
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-12.2.3-glibc28.patch
@@ -0,0 +1,11 @@
+--- erts/emulator/hipe/hipe_x86_signal.c	2008-06-12 14:17:48.831373565 +0200
++++ erts/emulator/hipe/hipe_x86_signal_ok.c	2008-06-12 14:43:05.132064804 +0200
+@@ -34,7 +34,7 @@
+ #endif
+ #include "hipe_signal.h"
+ 
+-#if __GLIBC__ == 2 && (__GLIBC_MINOR__ >= 3 && __GLIBC_MINOR__ <= 7)
++#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 3
+ /* See comment below for glibc 2.2. */
+ #ifndef __USE_GNU
+ #define __USE_GNU		/* to un-hide RTLD_NEXT */