From 989fdf144ef55baa67d6a18135f8ab25b06f9197 Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Tue, 12 Dec 2006 07:55:18 +0000 Subject: [PATCH] added hipe USE flag to give users control about that feature Package-Manager: portage-2.1.1-r2 --- dev-lang/erlang/Manifest | 30 ++-- dev-lang/erlang/erlang-11.2.2.ebuild | 155 --------------------- dev-lang/erlang/files/digest-erlang-11.2.2 | 9 -- 3 files changed, 15 insertions(+), 179 deletions(-) delete mode 100644 dev-lang/erlang/erlang-11.2.2.ebuild delete mode 100644 dev-lang/erlang/files/digest-erlang-11.2.2 diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest index b7d1a5910980..a050d9d18ddc 100644 --- a/dev-lang/erlang/Manifest +++ b/dev-lang/erlang/Manifest @@ -54,18 +54,18 @@ EBUILD erlang-11.2.1.ebuild 4508 RMD160 202a1ccaf9eb249acb4091c22087cbeadcb8bc4a MD5 1c5a282f3539bbc9fbf293a809bebc35 erlang-11.2.1.ebuild 4508 RMD160 202a1ccaf9eb249acb4091c22087cbeadcb8bc4a erlang-11.2.1.ebuild 4508 SHA256 a1c49582aa65db4ab10a8c8c4d96c2c31c8e712637b657d33866d0a689272817 erlang-11.2.1.ebuild 4508 -EBUILD erlang-11.2.2.ebuild 4819 RMD160 560318c627cc59ac641c2ce248a3dc3ad0039a78 SHA1 eddf75d60ec20bc6847205b8ded052ae0d8b0241 SHA256 8b355e80414712b6201abf1740860de008679569074571d4524dfa0063edf3d7 -MD5 b3f307a2a275c7cd4c131708cf16e2ed erlang-11.2.2.ebuild 4819 -RMD160 560318c627cc59ac641c2ce248a3dc3ad0039a78 erlang-11.2.2.ebuild 4819 -SHA256 8b355e80414712b6201abf1740860de008679569074571d4524dfa0063edf3d7 erlang-11.2.2.ebuild 4819 +EBUILD erlang-11.2.2-r1.ebuild 5085 RMD160 37d395649aa608a422da838595f5f3126df62d29 SHA1 6b9ca8fcaf94d150ed94f085afee7e6e59ae61a0 SHA256 40bdee7d76572f5dbbaa64a5c63aa9a0c31ff4690cf045ef673c8eec25e88a47 +MD5 d1f2949268c8363fcd31c255898385b9 erlang-11.2.2-r1.ebuild 5085 +RMD160 37d395649aa608a422da838595f5f3126df62d29 erlang-11.2.2-r1.ebuild 5085 +SHA256 40bdee7d76572f5dbbaa64a5c63aa9a0c31ff4690cf045ef673c8eec25e88a47 erlang-11.2.2-r1.ebuild 5085 EBUILD erlang-9c-r2.ebuild 1786 RMD160 cfcd3af93fa8a45da4068303b6bfebad8d076264 SHA1 42672bce4031943e9f7145406be7a83279ce867b SHA256 7f1e9e7f8260d6975d9a58df64cc2c42ac4fddf41e0c93f0cc89e0beb9ed55db MD5 42753c3aa0334123ff5edc1ad619ca8c erlang-9c-r2.ebuild 1786 RMD160 cfcd3af93fa8a45da4068303b6bfebad8d076264 erlang-9c-r2.ebuild 1786 SHA256 7f1e9e7f8260d6975d9a58df64cc2c42ac4fddf41e0c93f0cc89e0beb9ed55db erlang-9c-r2.ebuild 1786 -MISC ChangeLog 8960 RMD160 a85f3fd7a0778fb2c0a7505b7c24397eacbf490b SHA1 d34134fd3e223a8ca323c7b032dc5e898bd9bf74 SHA256 ee2fefdc8b1c42077a719f261af45343c0ef140e2353ded55572c1fc4fcce1e9 -MD5 b1bc5d14e0214834ec1ef122d775d598 ChangeLog 8960 -RMD160 a85f3fd7a0778fb2c0a7505b7c24397eacbf490b ChangeLog 8960 -SHA256 ee2fefdc8b1c42077a719f261af45343c0ef140e2353ded55572c1fc4fcce1e9 ChangeLog 8960 +MISC ChangeLog 9163 RMD160 51c853c6c9cc1b9e2a10bf163ef7a1077bdc9042 SHA1 92e897ebc6e06796db936f53600d4cfe5d88b779 SHA256 90bc5e9dcf9f31c882413df38508e81600f1865802924cf425622f580d1cb1bd +MD5 cc061a4a81e947b1f45d4996e1ea5a6c ChangeLog 9163 +RMD160 51c853c6c9cc1b9e2a10bf163ef7a1077bdc9042 ChangeLog 9163 +SHA256 90bc5e9dcf9f31c882413df38508e81600f1865802924cf425622f580d1cb1bd ChangeLog 9163 MISC metadata.xml 402 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 SHA1 2a45564353e8d0c2b9555294a6a269e56e0b6056 SHA256 c713a207afd5d65ef21d1c1e5fd3b867ce063dd9e46fc53db0734ad19f59ffe7 MD5 aea374917adc11a2d42b0b9d1bba3598 metadata.xml 402 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 metadata.xml 402 @@ -82,16 +82,16 @@ SHA256 aefeb78184742c0047cf00a4dc2f67accb7d28988a5b8f95d27e1009f4e1ff75 files/di MD5 8886bf905361bef7627acee2a1c8bb98 files/digest-erlang-11.2.1 768 RMD160 7483ae4810f0ccdebd46d1a0b7e325df96111976 files/digest-erlang-11.2.1 768 SHA256 3fd426daec26afe9200caae2e6721a80fce6acc5d1c11f85817230dd78949248 files/digest-erlang-11.2.1 768 -MD5 5f903efdd3245f02ca8ff7ae339abb1c files/digest-erlang-11.2.2 768 -RMD160 7336169350690cbdd0b6971d80e741593134cafb files/digest-erlang-11.2.2 768 -SHA256 4f2b1667397c5abd23d28c6b9927ff68d2774a3bb814bc7cd5341c6e48061166 files/digest-erlang-11.2.2 768 +MD5 5f903efdd3245f02ca8ff7ae339abb1c files/digest-erlang-11.2.2-r1 768 +RMD160 7336169350690cbdd0b6971d80e741593134cafb files/digest-erlang-11.2.2-r1 768 +SHA256 4f2b1667397c5abd23d28c6b9927ff68d2774a3bb814bc7cd5341c6e48061166 files/digest-erlang-11.2.2-r1 768 MD5 ae2205c16664d70f5ea47d249b2e566f files/digest-erlang-9c-r2 66 RMD160 bc09b0c487f2580aba706e7f35f84e0109479325 files/digest-erlang-9c-r2 66 SHA256 1e4ffb97ef49da9eecdb6affebda54e8e22b9c2707a099edeff382531b3b95c1 files/digest-erlang-9c-r2 66 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFdvNrNQqtfCuFneMRAtL+AJ4xHMTzBJbJdkA0Jiv/Z3e02uEmeQCeMMQ9 -hO7W0THPOT48tLukLdrllr0= -=MYES +iD8DBQFFfmBcNQqtfCuFneMRAmYfAJ4tIJf70lRms1nEkpWFMAMTLRTG2QCgkvaw +revyHNXrz2ZRddSxqwb9jJs= +=eUQW -----END PGP SIGNATURE----- diff --git a/dev-lang/erlang/erlang-11.2.2.ebuild b/dev-lang/erlang/erlang-11.2.2.ebuild deleted file mode 100644 index cb1a1146ca96..000000000000 --- a/dev-lang/erlang/erlang-11.2.2.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-11.2.2.ebuild,v 1.3 2006/12/06 16:44:08 opfer Exp $ - -inherit eutils multilib flag-o-matic elisp-common versionator - -# NOTE: When bumping you need to adjust the *_VER strings in -# src_install() to honour newer versions in the package (they -# are maintained separately upstream). -# As High Performance Erlang (HiPE) messes around a lot with -# assembler, it breaks hardened and some normal systems, so it has -# been disabled. Try with newer versions though. -# 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. -MY_PV="R$(get_major_version)B-$(get_version_component_range 3)" - -# 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 - doc? ( http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz - http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )" -# Not yet available for 11.2.1 -# http://developer.sipphone.com/ejabberd/erlang_epoll_patch/otp_src_${MY_PV}_epoll.patch" - -LICENSE="EPL" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" -IUSE="doc emacs java odbc ssl tk" - -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} - tk? ( dev-lang/tk )" - -S=${WORKDIR}/${MY_P} - -SITEFILE=50erlang-gentoo.el - -src_unpack() { - ## fix compilation on hardened systems, see bug #154338 - filter-flags "-fstack-protector" - filter-flags "-fstack-protector-all" - - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${PN}-10.2.6-export-TARGET.patch" - epatch "${FILESDIR}/10.2.6-manpage-emacs-gentoo.patch" - use odbc || sed -i 's: odbc : :' lib/Makefile -# epatch "${DISTDIR}"/otp_src_${MY_PV}_epoll.patch - - # Fix for bug #151612 - sed -i "s/__GLIBC_MINOR__\ ==\ 3/__GLIBC_MINOR__\ \>=\ 3/g" \ - ${S}/erts/emulator/hipe/hipe_x86_signal.c -} - -src_compile() { - use java || export JAVAC=false - # disable High Performance Erlang (HiPE) to avoid a lot of - # problems on hardened, bug #154338 - # Test every new version on hardened! -# --disable-hipe \ - econf \ - --enable-threads \ - $(use_with ssl) \ - || die "econf failed" - make || die "emake failed" - - if use emacs ; then - pushd lib/tools/emacs - elisp-compile *.el - 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) - - make INSTALL_PREFIX="${D}" install || die - dodoc AUTHORS EPLICENCE README - - dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl - dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc - dosym ${ERL_LIBDIR}/bin/ecc /usr/bin/ecc - dosym ${ERL_LIBDIR}/bin/elink /usr/bin/elink - dosym ${ERL_LIBDIR}/bin/ear /usr/bin/ear - 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 - - ## Remove ${D} from the following files - dosed ${ERL_LIBDIR}/bin/erl - dosed ${ERL_LIBDIR}/bin/start - cd ${ERL_LIBDIR}/erts-${ERL_ERTS_VER} - grep -rle "${D}" "${D}"/${ERL_LIBDIR}/erts-${ERL_ERTS_VER} | xargs sed -i -e "s:${D}::g" - - ## Clean up the no longer needed files - rm "${D}"/${ERL_LIBDIR}/Install - - if use doc ; then - for i in "${WORKDIR}"/man/man* ; do - dodir /usr/share/${i##${WORKDIR}}erl - done - for file in "${WORKDIR}"/man/man*/*.[1-9]; do - # Avoid namespace collisions - local newfile=${file}erl - cp ${file} ${newfile} - # Man page processing tools expect a capitalized "SEE ALSO" section - # header - sed -i -e 's,\.SH See Also,\.SH SEE ALSO,g' ${newfile} - # doman sucks so we can't use it - cp ${newfile} "${D}"/usr/share/man/man${newfile##*.}/ - done - 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} - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - popd - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen - einfo - einfo "If you need a symlink to one of erlang's binaries," - einfo "please open a bug and tell the maintainers." - einfo -} diff --git a/dev-lang/erlang/files/digest-erlang-11.2.2 b/dev-lang/erlang/files/digest-erlang-11.2.2 deleted file mode 100644 index 85d6be95bc8c..000000000000 --- a/dev-lang/erlang/files/digest-erlang-11.2.2 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 e2c45ced77ec63b9b1dd95c8f5396f7d otp_doc_html_R11B-2.tar.gz 4739895 -RMD160 82a4ab769566705333e059d920861d05be31754b otp_doc_html_R11B-2.tar.gz 4739895 -SHA256 588514c6b96b33dbaffd40aa5b51b9c0be65d02b6e81644c53b4c705a866db47 otp_doc_html_R11B-2.tar.gz 4739895 -MD5 c81023f591c1bace836de3aa874f3c2a otp_doc_man_R11B-2.tar.gz 632153 -RMD160 90b37a71ed29f14ec0d14a520aef47ed7b7ccad0 otp_doc_man_R11B-2.tar.gz 632153 -SHA256 643fb8210a2059b2c283c17601a0d5893f5cf409f05ed4852fbf2b0607693ac9 otp_doc_man_R11B-2.tar.gz 632153 -MD5 7d7cca1d2f392a8a317cb4c0bd904726 otp_src_R11B-2.tar.gz 11244153 -RMD160 989bab054992ba23666756379950082cd41adb00 otp_src_R11B-2.tar.gz 11244153 -SHA256 3dd483ee568c31655361474aa54a28cf11575c3b1b984f0b7a6980e083a8e44b otp_src_R11B-2.tar.gz 11244153 -- 2.26.2