fix building on Gentoo/FreeBSD

Package-Manager: portage-2.1.4.4

4 files changed, 28 insertions, 7 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 8fe65b0778d5..3fb3c48bad74 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,10 @@
 # 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.126 2008/07/12 06:36:21 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.127 2008/07/21 06:14:00 opfer Exp $
+
+  21 Jul 2008; Christian Faulhammer <opfer@gentoo.org>
+  +files/erlang-12.2.3-gethostbyname.patch, erlang-12.2.3.ebuild:
+  fix building on Gentoo/FreeBSD
 
   12 Jul 2008; Christian Faulhammer <opfer@gentoo.org> erlang-12.2.3.ebuild:
   stable x86, bug 231553
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index ea60eb56a50e..03c67a5a55d3 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -3,6 +3,7 @@ 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-gethostbyname.patch 609 RMD160 37e053888f38ddcb061993d9317e144e2240f7f7 SHA1 85e5eb8b2f5bfc24644b90118ac7f10d95489933 SHA256 c24b981761f39492a150dd1fee2fb10c17869873ea2cbd679090008775960bfa
 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
@@ -11,13 +12,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 4805 RMD160 60de68dd2bed04fd5974d15a2d41ae54dfd43a49 SHA1 c8d47c9ff3f8d3b2705d6ae3853a5356133bfa4c SHA256 419c51fbe47fbce6b702eec63d16cb35389eb625e33c60744a4fcc8137b8de94
-MISC ChangeLog 21388 RMD160 38f3bedc1cabe8a01e2b68d1204ff328b211ba45 SHA1 bd0fc1f910b8b55285f5bda3f91fcd3438a2faa7 SHA256 552c38c18ae5afe7c5f76a87a06fab28bb6dfb3d31409b8e6152315a475b9e1c
+EBUILD erlang-12.2.3.ebuild 4981 RMD160 869dca4be6828db402e59fd30e12c912474ad308 SHA1 3dec2cc5c9d4c0ac2cbaecb14996b8e0025aaf6b SHA256 4e4ea1f27a2c3a253bd7bac2d95ce15d9abad45044221b5d457b1b17fec52bfb
+MISC ChangeLog 21543 RMD160 7cb6ea3b5025ad4f33d519f84c3807a1a31d35cd SHA1 fd3fb1a128490e9f9570af6bb2f486f093eb7109 SHA256 54c1146bb8882af391bc62c4381ef8f5d92cb95194415f6907be5471e57db027
 MISC metadata.xml 476 RMD160 da948210972738dfbd855236cecc30b22d9cdb3e SHA1 b31a990b8d57f0c32a9cccdd2c60958c1f1a847f SHA256 393328bc46a0f98b7e1be0f6b4bd2f8e3070762e23cbca17fa32f6eecd8a2af7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkh4UQAACgkQNQqtfCuFneMgRACdFjN7SOxNPR3mp0UpVbhu6E0i
-kWIAnAmlqHTdbJMUNcOv4nrVFgxzIL13
-=tBIr
+iEYEARECAAYFAkiEKTAACgkQNQqtfCuFnePJ+gCcC6klbsDgCSc4DmDaCfBumvUt
+G0AAn0Y2E6IDA/xy7VFZIY7+zNHr5SQ6
+=Y0ur
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-12.2.3.ebuild b/dev-lang/erlang/erlang-12.2.3.ebuild
index dc94bf16be06..5e43674b9524 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.6 2008/07/12 06:36:21 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-12.2.3.ebuild,v 1.7 2008/07/21 06:14:00 opfer Exp $
 
 inherit autotools elisp-common eutils flag-o-matic multilib versionator
 
@@ -50,6 +50,10 @@ src_unpack() {
 	# fixes bug 226063, reported and accepted upstream for R12B-4
 	epatch "${FILESDIR}"/${P}-glibc28.patch
 
+	# Fix build on Gentoo/FreeBSD, upstream once accepted it but restored previous behaviour
+	# because of failures on vanilla BSD
+	epatch "${FILESDIR}"/${P}-gethostbyname.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-gethostbyname.patch b/dev-lang/erlang/files/erlang-12.2.3-gethostbyname.patch
new file mode 100644
index 000000000000..cdb0376b1058
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-12.2.3-gethostbyname.patch
@@ -0,0 +1,12 @@
+diff -Naur otp_src_R11B-4.orig/lib/erl_interface/src/connect/ei_resolve.c otp_src_R11B-4/lib/erl_interface/src/connect/ei_resolve.c
+--- otp_src_R11B-4.orig/lib/erl_interface/src/connect/ei_resolve.c	2006-11-06 14:53:29 +0100
++++ otp_src_R11B-4/lib/erl_interface/src/connect/ei_resolve.c	2007-06-13 23:14:06 +0200
+@@ -614,7 +615,7 @@
+ #ifndef HAVE_GETHOSTBYNAME_R
+   return my_gethostbyname_r(name,hostp,buffer,buflen,h_errnop);
+ #else
+-#ifdef __GLIBC__
++#if (defined(__GLIBC__) || (__FreeBSD_version >= 602000))
+   struct hostent *result;
+ 
+   gethostbyname_r(name, hostp, buffer, buflen, &result, h_errnop);