From 311a0e629ca1efa94ba90083915fa990b5899610 Mon Sep 17 00:00:00 2001 From: Justin Riley Date: Tue, 17 Apr 2012 20:32:40 -0400 Subject: erlang: backport fix for 383697 to 13.2.4 --- dev-lang/erlang/Manifest | 3 + dev-lang/erlang/erlang-13.2.4.ebuild | 176 +++++++++++++++++++++ dev-lang/erlang/files/50erlang-gentoo.el | 5 + dev-lang/erlang/files/epmd.init | 20 +++ .../erlang/files/erlang-14.2.2-interface.patch | 11 ++ 5 files changed, 215 insertions(+) create mode 100644 dev-lang/erlang/Manifest create mode 100644 dev-lang/erlang/erlang-13.2.4.ebuild create mode 100644 dev-lang/erlang/files/50erlang-gentoo.el create mode 100644 dev-lang/erlang/files/epmd.init create mode 100644 dev-lang/erlang/files/erlang-14.2.2-interface.patch diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest new file mode 100644 index 0000000..1ccd45d --- /dev/null +++ b/dev-lang/erlang/Manifest @@ -0,0 +1,3 @@ +DIST otp_doc_html_R13B04.tar.gz 27440785 SHA256 fdad0db55ab9339703e7cd61626b5cca95f187084d1dabf07ac97f528b4f47aa SHA512 293fc334eeba9fede99c7c2b46334ed037ea02139121dff48bd29f6437b9ae9d1850ea755f101e3e36789b00090e2f768897a556d382eef7dda8b6e796143557 WHIRLPOOL 047639b4554a8b1bf362c369604ada2dd314eb4400f943681da69516b6b733156a9792193525390c0ff7fa8c9fe22b158391e2c1ea9384c27376142219950d1f +DIST otp_doc_man_R13B04.tar.gz 1033584 SHA256 3646198b64bbea0f3760987d20d3392b0b5b2955394a917b92a2c6664a310dd6 SHA512 938afb93fa66d010f822a5071166e5659711d39caf860a72f2d7043a2585a54c20cf51d3ddb4a96b569dff7e6f6487ef4171653f08381c94585512440262ba06 WHIRLPOOL e27d923742f52d4dac31331dd2d54619aab4689acf5a8a2cd85ec08a6567dd5a13c471c70fecb047d534cb64f0dd9df664e8e25177d3efebc810b8a09963e169 +DIST otp_src_R13B04.tar.gz 59060560 SHA256 e2694383b3857f5edfc242b8c3acbfba4683e448387fa124d8e587cba234af43 SHA512 d7e6612594030c738cda28104d0c91e420cb1ba9eb65919befa29fa269955c124356f5a5b6e1affd92630fd4d29270a3c5d7f65862b5c85a1fd1ac6fde15f600 WHIRLPOOL f82786a4fb47eea41316fe0077a4eed34731f2902edb2bd883d0d1b4e2aaf7f92625337e744435c0418898980263c1f37981eaaffcc7fde883158b2b4753350f diff --git a/dev-lang/erlang/erlang-13.2.4.ebuild b/dev-lang/erlang/erlang-13.2.4.ebuild new file mode 100644 index 0000000..833dc82 --- /dev/null +++ b/dev-lang/erlang/erlang-13.2.4.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-13.2.4.ebuild,v 1.14 2011/12/07 17:44:39 ulm Exp $ + +EAPI=3 +WX_GTK_VER="2.8" + +inherit autotools elisp-common eutils multilib versionator wxwidgets + +# NOTE: If you need symlinks for binaries please tell maintainers or +# open up a bug to let it be created. + +# erlang uses a really weird versioning scheme which caused quite a few problems +# already. Thus we do a slight modification converting all letters to digits to +# make it more sane (see e.g. #26420) + +# the next line selects the right source. +ERL_VER=($(get_version_components)) +MY_PV="R$(get_major_version)B0${ERL_VER[2]}" + +# ATTN!! Take care when processing the C, etc version! +MY_P=otp_src_${MY_PV} + +DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" +HOMEPAGE="http://www.erlang.org/" +SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz + http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz + doc? ( http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )" + +LICENSE="ErlPL-1.1" +SLOT="0" +KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris" +IUSE="doc emacs hipe java kpoll odbc smp sctp ssl tk wxwidgets" + +RDEPEND=">=dev-lang/perl-5.6.1 + ssl? ( >=dev-libs/openssl-0.9.7d ) + emacs? ( virtual/emacs ) + java? ( >=virtual/jdk-1.2 ) + odbc? ( dev-db/unixODBC )" +DEPEND="${RDEPEND} + wxwidgets? ( x11-libs/wxGTK:2.8[opengl] ) + sctp? ( net-misc/lksctp-tools ) + tk? ( dev-lang/tk )" + +S="${WORKDIR}/${MY_P}" + +SITEFILE=50${PN}-gentoo.el + +pkg_setup() { + use wxwidgets && wxwidgets_pkg_setup +} + +src_prepare() { + use odbc || sed -i 's: odbc : :' lib/Makefile + + if ! use wxwidgets; then + sed -i 's: wx : :' lib/Makefile + rm -rf lib/wx + fi + + if use hipe; then + ewarn + ewarn "You enabled High performance Erlang. Be aware that this extension" + ewarn "can break the compilation in many ways, especially on hardened systems." + ewarn "Don't cry, don't file bugs, just disable it! If you have a fix, tell us though on Bugzilla." + ewarn + fi + + # prevent configure from injecting -m32 by default on Darwin, bug #334155 + sed -i -e 's/Darwin-i386/Darwin-NO/' configure.in || die + sed -i -e '/\<\(LD\|C\)FLAGS="-m32/s/-m32//' erts/configure.in || die + # bug 383697 + sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c || die + + eautoreconf +} + +src_configure() { + use java || export JAVAC=false + + econf \ + --enable-threads \ + --enable-shared-zlib \ \ + $(use_enable sctp) \ + $(use_enable hipe) \ + $(use_with ssl ssl "${EPREFIX}"/usr) \ + $(use_enable ssl dynamic-ssl-lib) \ + $(use_enable kpoll kernel-poll) \ + $(use_enable smp smp-support) \ + || die +} + +src_compile() { + use java || export JAVAC=false + emake -j1 || die + + if use emacs ; then + pushd lib/tools/emacs + elisp-compile *.el || die + popd + fi +} + +extract_version() { + sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk" +} + +src_install() { + local ERL_LIBDIR=/usr/$(get_libdir)/erlang + local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN) + local ERL_ERTS_VER=$(extract_version erts VSN) + + emake -j1 INSTALL_PREFIX="${D}" install || die + dodoc AUTHORS README.md + + dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl + dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc + dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript + dosym \ + "${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \ + /usr/bin/erl_call + dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam + use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp + + ## Remove ${D} from the following files + sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/erl" || die + sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/start" || die + grep -rle "${D}" "${ED}/${ERL_LIBDIR}/erts-${ERL_ERTS_VER}" | xargs sed -i -e "s:${D}::g" + + ## Clean up the no longer needed files + rm "${ED}/${ERL_LIBDIR}/Install"||die + + for i in "${WORKDIR}"/man/man* ; do + dodir "${ERL_LIBDIR}/${i##${WORKDIR}}" + done + for file in "${WORKDIR}"/man/man*/*.[1-9]; do + # doman sucks so we can't use it + cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/ + done + # extend MANPATH, so the normal man command can find it + # see bug 189639 + dodir /etc/env.d/ + echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang" + + if use doc ; then + dohtml -A README,erl,hrl,c,h,kwc,info -r \ + "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* + fi + + if use emacs ; then + pushd "${S}" + elisp-install erlang lib/tools/emacs/*.{el,elc} + sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ + "${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE} + elisp-site-file-install "${T}"/${SITEFILE} + popd + fi + + # prepare erl for SMP, fixes bug #188112 + use smp && sed -i -e 's:\(exec.*erlexec\):\1 -smp:' \ + "${ED}/${ERL_LIBDIR}/bin/erl" +} + +pkg_postinst() { + use emacs && elisp-site-regen + elog + elog "If you need a symlink to one of Erlang's binaries," + elog "please open a bug on http://bugs.gentoo.org/" + elog + elog "Gentoo's versioning scheme differs from the author's, so please refer to this version as ${MY_PV}" + elog +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-lang/erlang/files/50erlang-gentoo.el b/dev-lang/erlang/files/50erlang-gentoo.el new file mode 100644 index 0000000..db1ae76 --- /dev/null +++ b/dev-lang/erlang/files/50erlang-gentoo.el @@ -0,0 +1,5 @@ +;;; erlang site-lisp configuration + +(add-to-list 'load-path "@SITELISP@") +(require 'erlang-start) +(setq erlang-root-dir "/usr/share") diff --git a/dev-lang/erlang/files/epmd.init b/dev-lang/erlang/files/epmd.init new file mode 100644 index 0000000..0b2248a --- /dev/null +++ b/dev-lang/erlang/files/epmd.init @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/files/epmd.init,v 1.1 2010/11/08 00:47:30 fauli Exp $ + +depend() { + need net +} + +start() { + ebegin "Starting Erlang Port Mapper Daemon" + start-stop-daemon --start --quiet --user nobody --group nobody --exec /usr/bin/epmd -- -daemon + eend $? +} + +stop() { + ebegin "Stopping Erlang Port Mapper Daemon" + /usr/bin/epmd -kill >/dev/null + eend $? +} diff --git a/dev-lang/erlang/files/erlang-14.2.2-interface.patch b/dev-lang/erlang/files/erlang-14.2.2-interface.patch new file mode 100644 index 0000000..a3ede6a --- /dev/null +++ b/dev-lang/erlang/files/erlang-14.2.2-interface.patch @@ -0,0 +1,11 @@ +https://github.com/erlang/otp/commit/c302809fbe5b3873d5c459da11ed49ea73a6739f +--- lib/erl_interface/src/legacy/erl_timeout.c ++++ lib/erl_interface/src/legacy/erl_timeout.c +@@ -43,6 +43,7 @@ + # endif + #endif + ++#include "erl_interface.h" + #include "erl_timeout.h" + + typedef struct jmp_s { -- cgit v1.2.3-65-gdbad