dev-java/antlr: fixed bug #385797

(Portage version: 2.1.10.29/cvs/Linux x86_64)

3 files changed, 197 insertions, 1 deletions

diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index 162ac1db3065..b2a470f60d04 100644
--- a/dev-java/antlr/ChangeLog
+++ b/dev-java/antlr/ChangeLog
@@ -1,6 +1,13 @@
 # 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.89 2011/08/18 19:21:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.90 2011/10/19 01:42:15 fordfrog Exp $
+
+*antlr-2.7.7-r4 (19 Oct 2011)
+
+  19 Oct 2011; Miroslav Šulc <fordfrog@gentoo.org>
+  +files/2.7.7-static-libs-fix.patch, +antlr-2.7.7-r4.ebuild:
+  Fixed linking when static-libs is disabled (bug #385797, thanks to Roeland
+  Douma <roeland@rullzer.com> for the patch)
 
 *antlr-2.7.7-r3 (18 Aug 2011)
 
diff --git a/dev-java/antlr/antlr-2.7.7-r4.ebuild b/dev-java/antlr/antlr-2.7.7-r4.ebuild
new file mode 100644
index 000000000000..c24db12a4df2
--- /dev/null
+++ b/dev-java/antlr/antlr-2.7.7-r4.ebuild
@@ -0,0 +1,167 @@
+# 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-r4.ebuild,v 1.1 2011/10/19 01:42:15 fordfrog Exp $
+
+EAPI="3"
+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}/2.7.7-gcc-4.3.patch" "${FILESDIR}/2.7.7-gcc-4.4.patch" "${FILESDIR}/2.7.7-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-getCC)} ${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
+
+	if ! use static-libs ; then
+		epatch "${FILESDIR}/${PV}-static-libs-fix.patch"
+	fi
+}
+
+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" || die "compile failed"
+	if use cxx; then
+		pushd lib/cpp/src > /dev/null
+		make_shared_lib libantlr.a || die
+		if use static-libs; then
+			make clean
+			emake || die "compile static failed"
+		fi
+		popd > /dev/null
+	fi
+	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 > "${S}"/antlr.pc
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe "${S}"/scripts/antlr-config
+
+	if use cxx ; then
+		cd "${S}"/lib/cpp
+		einstall || die "failed to install C++ files"
+		dolib.so src/libantlr$(get_libname $(get_major_version)) || die
+		dosym libantlr$(get_libname $(get_major_version)) \
+			/usr/$(get_libdir)/libantlr$(get_libname)
+		use static-libs && dolib.a src/libantlr.a
+	fi
+
+	if use java ; then
+		java-pkg_dojar "${S}"/antlr/antlr.jar
+
+		use script && java-pkg_dolauncher antlr --main antlr.Tool
+
+		use source && java-pkg_dosrc "${S}"/antlr
+		use doc && java-pkg_dohtml -r "${S}"/doc/*
+	fi
+
+	if use mono ; then
+		cd "${S}"/lib
+
+		dodir /usr/$(get_libdir)/antlr/
+		insinto /usr/$(get_libdir)/antlr/
+
+		doins antlr.astframe.dll
+		doins antlr.runtime.dll
+
+		insinto /usr/$(get_libdir)/pkgconfig
+		doins "${S}"/antlr.pc
+	fi
+
+	if use python ; then
+		cd "${S}"/lib/python
+		distutils_src_install
+	fi
+
+	if use examples ; then
+		find "${S}"/examples -iname Makefile\* -exec rm \{\} \;
+
+		dodir /usr/share/doc/${PF}/examples
+		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
+
+	newdoc "${S}"/README.txt README || die
+}
+
+pkg_postinst() {
+	use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
+}
diff --git a/dev-java/antlr/files/2.7.7-static-libs-fix.patch b/dev-java/antlr/files/2.7.7-static-libs-fix.patch
new file mode 100644
index 000000000000..163aa3e97e5c
--- /dev/null
+++ b/dev-java/antlr/files/2.7.7-static-libs-fix.patch
@@ -0,0 +1,22 @@
+diff --git a/scripts/antlr-config.in.old b/scripts/antlr-config.in
+index 75b94c6..adab1e6 100755
+--- a/scripts/antlr-config.in.old
++++ b/scripts/antlr-config.in
+@@ -19,7 +19,7 @@ Options:
+ 	[--cflags]
+ 	[--cxxflags]
+ Libraries:
+-	libantlr.a
++	libantlr.so
+ EOF
+ 	exit $1
+ }
+@@ -58,7 +58,7 @@ while test $# -gt 0; do
+           libs="${libdir}/antlr.lib"
+           ;;
+           *)
+-          libs="${libdir}/libantlr.a"
++          libs="${libdir}/libantlr.so"
+           ;;
+       esac
+       echo_libs=yes