diff options
| author |   Christian Faulhammer <opfer@gentoo.org> | 2008-07-21 06:14:00 +0000 |
|---|---|---|
| committer | Christian Faulhammer <opfer@gentoo.org> | 2008-07-21 06:14:00 +0000 |
| commit | 1423ec0f2577ca0b59175c656f94b713855a0bf3 (patch) | |
| tree | 2bcf12c1e499d38bdc4e7eeee2260f466dec0896 /dev-lang/erlang | |
| parent | add USE=test with dependency on dev-texlive/texlive-langfrench, needed to fix... (diff) | |
| download | gentoo-2-1423ec0f2577ca0b59175c656f94b713855a0bf3.tar.gz gentoo-2-1423ec0f2577ca0b59175c656f94b713855a0bf3.tar.bz2 gentoo-2-1423ec0f2577ca0b59175c656f94b713855a0bf3.zip | |
fix building on Gentoo/FreeBSD
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-lang/erlang')
| -rw-r--r-- | dev-lang/erlang/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/erlang/erlang-12.2.3.ebuild | 6 | ||||
| -rw-r--r-- | dev-lang/erlang/files/erlang-12.2.3-gethostbyname.patch | 12 |
3 files changed, 22 insertions, 2 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/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); |