diff options
| -rw-r--r-- | dev-lang/erlang/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/erlang/erlang-14.2.1.ebuild | 175 | ||||
| -rw-r--r-- | dev-lang/erlang/erlang-14.2.2.ebuild | 175 | ||||
| -rw-r--r-- | dev-lang/erlang/files/erlang-14.2.1-fortify.patch | 36 |
4 files changed, 5 insertions, 387 deletions
diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog index 7654d4a33a04..8d815994a9bd 100644 --- a/dev-lang/erlang/ChangeLog +++ b/dev-lang/erlang/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/erlang # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.209 2011/05/04 08:11:31 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.210 2011/06/06 08:40:13 djc Exp $ + + 06 Jun 2011; Dirkjan Ochtman <djc@gentoo.org> -erlang-14.2.1.ebuild, + -files/erlang-14.2.1-fortify.patch, -erlang-14.2.2.ebuild: + Remove old versions. *erlang-14.2.2-r1 (04 May 2011) diff --git a/dev-lang/erlang/erlang-14.2.1.ebuild b/dev-lang/erlang/erlang-14.2.1.ebuild deleted file mode 100644 index 7366bbf50aab..000000000000 --- a/dev-lang/erlang/erlang-14.2.1.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# 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-14.2.1.ebuild,v 1.2 2011/01/12 09:35:47 fauli Exp $ - -EAPI=3 -WX_GTK_VER="2.8" - -inherit 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="EPL" -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 - !<app-accessibility/speech-dispatcher-0.7.1-r1 - 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() { - epatch "${FILESDIR}/${P}-fortify.patch" # bug 348559 - use odbc || sed -i 's: odbc : :' lib/Makefile - - # bug 263129, don't ignore LDFLAGS, reported upstream - sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in || die - - if ! use wxwidgets; then - sed -i 's: wx : :' lib/Makefile - rm -rf lib/wx - fi - - # Nasty workaround, reported upstream - cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in || die - - # prevent configure from injecting -m32 by default on Darwin, bug #334155 - # Nasty hack - sed -i -e 's/Darwin-i386/Darwin-NO/' configure.in || die - sed -i -e '/\<\(LD\|C\)FLAGS="-m32/s/-m32//' erts/configure.in || die -} - -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" - - newinitd "${FILESDIR}"/epmd.init epmd || die -} - -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/erlang-14.2.2.ebuild b/dev-lang/erlang/erlang-14.2.2.ebuild deleted file mode 100644 index 709b3dbffcf7..000000000000 --- a/dev-lang/erlang/erlang-14.2.2.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# 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-14.2.2.ebuild,v 1.1 2011/04/29 18:35:24 djc Exp $ - -EAPI=3 -WX_GTK_VER="2.8" - -inherit 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="EPL" -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 - !<app-accessibility/speech-dispatcher-0.7.1-r1 - 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 - - # bug 263129, don't ignore LDFLAGS, reported upstream - sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in || die - - if ! use wxwidgets; then - sed -i 's: wx : :' lib/Makefile - rm -rf lib/wx - fi - - # Nasty workaround, reported upstream - cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in || die - epatch "${FILESDIR}/${P}-interface.patch" || die - - # prevent configure from injecting -m32 by default on Darwin, bug #334155 - # Nasty hack - sed -i -e 's/Darwin-i386/Darwin-NO/' configure.in || die - sed -i -e '/\<\(LD\|C\)FLAGS="-m32/s/-m32//' erts/configure.in || die -} - -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" - - newinitd "${FILESDIR}"/epmd.init epmd || die -} - -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/erlang-14.2.1-fortify.patch b/dev-lang/erlang/files/erlang-14.2.1-fortify.patch deleted file mode 100644 index 8b3cad0560d5..000000000000 --- a/dev-lang/erlang/files/erlang-14.2.1-fortify.patch +++ /dev/null @@ -1,36 +0,0 @@ - -Erlang 14B01 (aka 14.2.1 in Gentoo) fails with 64bit arches and FORTIFY_SOURCE=2 or greater, consisting of a buffer overflow warning, which is not an overflow but an overreaction of GCC. - -Upstream report: http://www.erlang.org/cgi-bin/ezmlm-cgi?2:mss:2135:bdnooaggpdnbokaboakj -Upstream fix: https://github.com/erlang/otp/commit/3b7fd1030711ad56fa45d18dc6e0f1d0beee2399 - -http://bugs.gentoo.org/show_bug.cgi?id=348559 - ---- erts/emulator/drivers/common/efile_drv.c -+++ erts/emulator/drivers/common/efile_drv.c -@@ -385,7 +385,6 @@ - ErlDrvBinary *binp; - int size; - int offset; -- char name[1]; - } read_file; - struct { - struct t_readdir_buf *first_buf; -@@ -1117,7 +1116,7 @@ - Sint64 size; - - if (! (d->result_ok = -- efile_openfile(&d->errInfo, d->c.read_file.name, -+ efile_openfile(&d->errInfo, d->b, - EFILE_MODE_READ, &fd, &size))) { - goto done; - } -@@ -3071,7 +3070,7 @@ - d->command = command; - d->reply = !0; - /* Copy name */ -- FILENAME_COPY(d->c.read_file.name, filename); -+ FILENAME_COPY(d->b, filename); - d->c.read_file.binp = NULL; - d->invoke = invoke_read_file; - d->free = free_read_file; |