From 3e240318484830ce11773efa9a410144b22ca645 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Thu, 22 Dec 2011 19:38:55 +0000 Subject: [PATCH] Fixed wrong linking (CC instead of CXX) which caused as-needed failures. Switched to EAPI4. Ebuild cleanup. Package-Manager: portage-2.1.10.41/cvs/Linux x86_64 --- dev-java/antlr/ChangeLog | 8 +- dev-java/antlr/Manifest | 13 ++- dev-java/antlr/antlr-2.7.7-r5.ebuild | 163 +++++++++++++++++++++++++++ 3 files changed, 182 insertions(+), 2 deletions(-) create mode 100644 dev-java/antlr/antlr-2.7.7-r5.ebuild diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog index b2a470f60d04..25551d4eb81d 100644 --- a/dev-java/antlr/ChangeLog +++ b/dev-java/antlr/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/antlr # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.90 2011/10/19 01:42:15 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.91 2011/12/22 19:38:55 bicatali Exp $ + +*antlr-2.7.7-r5 (22 Dec 2011) + + 22 Dec 2011; Sébastien Fabbro +antlr-2.7.7-r5.ebuild: + Fixed wrong linking (CC instead of CXX) which caused as-needed failures. + Switched to EAPI4. Ebuild cleanup. *antlr-2.7.7-r4 (19 Oct 2011) diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest index af46dd813e08..89c7d1210929 100644 --- a/dev-java/antlr/Manifest +++ b/dev-java/antlr/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 2.7.7-gcc-4.3.patch 383 RMD160 b07b999bd1fe9ed4e90c2c4240c6b8dcececa460 SHA1 9561c692ccfad5f320739897da0ce985d8c804d7 SHA256 de68d3a12a03d7bcdbd3e1cf5ab7d773123a55b4d9e8bb9f3a873fa2c2be84e2 AUX 2.7.7-gcc-4.4.patch 257 RMD160 b1b2058707e6132e4db8d4f7dbd7648c8d3799eb SHA1 b618b5a3f603a3cb07acda07e85ab022cfb3cdef SHA256 4d1c713424893be36f5b29f73a9e7f491274abe6535af31c26bf0aa8dbf00256 AUX 2.7.7-makefixes.patch 3151 RMD160 260811a8fd616fa2acd8ee92b57e004bef1af2d7 SHA1 81eedd78cb7f71e783ee4450c9eda72411ffbdc8 SHA256 04c15e4c6054c3504e21ed5ef00bfb011f5345146e5c044f607e14a30fda1360 @@ -10,7 +13,15 @@ EBUILD antlr-2.7.7-r1.ebuild 2947 RMD160 c839f55ba5c00ffbb01fc39bf82415055b51ff4 EBUILD antlr-2.7.7-r2.ebuild 3725 RMD160 ec7bc481551f808cdf084a9a0ca483159bdfae1a SHA1 ea207169f9b6dedd3222a946d6b8e526cff73376 SHA256 cc324f6fe80924888dd80f1311a85ece9c1ce624d777fca44c4cc5efefd02aab EBUILD antlr-2.7.7-r3.ebuild 4386 RMD160 ed8d880ed7014ee63e971e3f5496e1f457e47399 SHA1 5f69cffa5a78346772098fd9c8844e47cb9e9c59 SHA256 5bca894c9229d8584f06395d8f2c28c533963f61bcb40568a8d46ebc7cda833d EBUILD antlr-2.7.7-r4.ebuild 4470 RMD160 dd5aec2b255091a71042fc8b7fdb858e198a48cb SHA1 a8498bb0a71f25371d08ddc3a97e5c65dea2ea0a SHA256 01d04272660fdfb272fa94c5ccdbf6df8edd81b8d27582123f8888373d5dfd02 +EBUILD antlr-2.7.7-r5.ebuild 4347 RMD160 9ab7c3ea31f9da1102bc1bac28a49e4073524cd9 SHA1 4ee25e9a6a8d44ce9e45f48486a677faf98d3ac6 SHA256 321d1a8aacba5474c09eeafcc84d2117fb350a22ba26d0e3dc64b0af3d319088 EBUILD antlr-2.7.7.ebuild 2934 RMD160 b11efc4a4e8d5e68b423a4c8e16cb4a8d2f8c374 SHA1 1612e05a6715cba4ae1da0a2fd0ca91d4356b53b SHA256 3db0e8b0f1de5a77d714e10784fa550ad84a24e636e6503d2f9ad99a27376385 EBUILD antlr-3.1.3-r2.ebuild 3482 RMD160 0c589316a1d2f154d0add9cc0423be2ac0ee7a40 SHA1 6f71e90bdc12ef28d4f66b3d19c9cda515933c9e SHA256 4bee733cf85ddac23b038534a6decc5c5aa96cb649f059ef6cf285605c5c2247 -MISC ChangeLog 12381 RMD160 eb42ec0ebeae3635c54b33f81b44bff05a82066e SHA1 4c03eb9597ac0a5c2a1a1b70e01aa44affeeaecb SHA256 a85bcbda20f9407614515a5befab9749c7aae8ed8d4af2b05b8648288ec6b502 +MISC ChangeLog 12604 RMD160 f5e0f7dab0d46d7cddb856c9a5718e35f3beff70 SHA1 5c5c999978c69c33340cf4924d93fd9747f37ec4 SHA256 2fde0c73b4ace04f4b871c182b6b14734d4df322742884f5054435ebd4866bd3 MISC metadata.xml 363 RMD160 72102b036fe76e530f4519a0aa081778aae7262a SHA1 b8f61d984af7ca03255f57bf4126799e58863f2d SHA256 6aa7ec680dc08ab936d6f59f1444bba56902fec42eaf16d5c9919350a5c355cc +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iEYEARECAAYFAk7zh1gACgkQ1ycZbhPLE2DvbACgmrhtw/9aoyOBWDbF+nybsxUA +b78An3HqSYhBjjvopofGH245PuPTmVU3 +=DqBb +-----END PGP SIGNATURE----- diff --git a/dev-java/antlr/antlr-2.7.7-r5.ebuild b/dev-java/antlr/antlr-2.7.7-r5.ebuild new file mode 100644 index 000000000000..af08d3eba112 --- /dev/null +++ b/dev-java/antlr/antlr-2.7.7-r5.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r5.ebuild,v 1.1 2011/12/22 19:38:55 bicatali Exp $ + +EAPI=4 +PYTHON_DEPEND="python? 2" + +inherit base java-pkg-2 mono distutils multilib toolchain-funcs versionator + +DESCRIPTION="A parser generator for C++, C#, Java, and Python" +HOMEPAGE="http://www.antlr2.org/" +SRC_URI="http://www.antlr2.org/download/${P}.tar.gz" + +LICENSE="ANTLR" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc debug examples mono +cxx +java python script source static-libs" + +# TODO do we actually need jdk at runtime? +RDEPEND=">=virtual/jdk-1.3 + mono? ( dev-lang/mono )" +DEPEND="${RDEPEND} + script? ( !dev-util/pccts ) + source? ( app-arch/zip )" + +PATCHES=( "${FILESDIR}"/${PV}-{gcc-4.3,gcc-4.4,makefixes}.patch ) + +make_shared_lib() { + local soname=$(basename "${1%.a}")$(get_libname $(get_major_version)) + einfo "Making ${soname}" + [[ ${CHOST} == *-darwin* ]] \ + && make_shared_lib_macho "${soname}" "$1" "$2"\ + || make_shared_lib_elf "${soname}" "$1" "$2" +} + +make_shared_lib_elf() { + local soname=$1 archive=$2 cc=$3 + ${cc:-$(tc-getCXX)} ${LDFLAGS} \ + -shared -Wl,-soname="${soname}" \ + -Wl,--whole-archive "${archive}" -Wl,--no-whole-archive \ + -o $(dirname "${archive}")/"${soname}" || return 1 +} + +make_shared_lib_macho() { + local soname=$1 archive=$2 cc=$3 + ${cc:-$(tc-getCXX)} ${LDFLAGS} \ + -dynamiclib -install_name "${EPREFIX}/usr/$(get_libdir)/${soname}" \ + -force_load "${archive}" \ + -o $(dirname "${archive}")/"${soname}" || return 1 +} + +pkg_setup() { + java-pkg-2_pkg_setup + + if use python; then + python_set_active_version 2 + python_pkg_setup + fi +} + +src_prepare() { + base_src_prepare + sed -i \ + -e 's/install:.*this-install/install:/' \ + lib/cpp/src/Makefile.in || die + + use static-libs || epatch "${FILESDIR}/${PV}-static-libs-fix.patch" +} + +src_configure() { + # don't ask why, but this is needed for stuff to get built properly + # across the various JDKs + JAVACFLAGS="+ ${JAVACFLAGS}" + + # mcs for https://bugs.gentoo.org/show_bug.cgi?id=172104 + CSHARPC="mcs" econf $(use_enable java) \ + $(use_enable python) \ + $(use_enable mono csharp) \ + $(use_enable debug) \ + $(use_enable examples) \ + $(use_enable cxx) \ + --enable-verbose +} + +src_compile() { + emake CXXFLAGS="${CXXFLAGS} -fPIC" + if use cxx; then + pushd lib/cpp/src > /dev/null + make_shared_lib libantlr.a || die + if use static-libs; then + make clean + emake + fi + popd > /dev/null + fi +} + +src_install() { + exeinto /usr/bin + doexe scripts/antlr-config + + if use cxx ; then + pushd lib/cpp > /dev/null + einstall + dolib.so src/libantlr$(get_libname $(get_major_version)) + dosym libantlr$(get_libname $(get_major_version)) \ + /usr/$(get_libdir)/libantlr$(get_libname) + use static-libs && dolib.a src/libantlr.a + newdoc AUTHORS{,.cpp} + newdoc ChangeLog{,.cpp} + newdoc TODO{,.cpp} + popd > /dev/null + fi + + if use java ; then + java-pkg_dojar antlr/antlr.jar + use script && java-pkg_dolauncher antlr --main antlr.Tool + use source && java-pkg_dosrc antlr + use doc && java-pkg_dohtml -r doc/* + fi + + if use mono ; then + pushd lib > /dev/null + dodir /usr/$(get_libdir)/antlr/ + insinto /usr/$(get_libdir)/antlr/ + doins antlr.astframe.dll + doins antlr.runtime.dll + sed -e "s|@prefix@|${EPREFIX}/usr|" \ + -e 's|@exec_prefix@|${prefix}|' \ + -e "s|@libdir@|\$\{exec_prefix\}/$(get_libdir)/antlr|" \ + -e 's|@libs@|-r:${libdir}/antlr.astframe.dll -r:${libdir}/antlr.runtime.dll|' \ + -e "s|@VERSION@|${PV}|" \ + "${FILESDIR}"/antlr.pc.in > antlr.pc + insinto /usr/$(get_libdir)/pkgconfig + doins antlr.pc + popd > /dev/null + fi + + if use python ; then + pushd lib/python > /dev/null + distutils_src_install + popd > /dev/null + fi + + if use examples ; then + find "${S}"/examples -iname Makefile\* -exec rm \{\} \; + insinto /usr/share/doc/${PF}/examples + use cxx && doins -r "${S}"/examples/cpp + use java && doins -r "${S}"/examples/java + use mono && doins -r "${S}"/examples/csharp + use python && doins -r "${S}"/examples/python + fi + + dodoc README.txt +} + +pkg_postinst() { + use python && distutils_pkg_postinst +} + +pkg_postrm() { + use python && distutils_pkg_postrm +} -- 2.26.2