commit: b4cfe080ee6ac869a5ce57766cedf8e6582cfb87
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 3 22:26:55 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 3 22:27:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4cfe080
dev-libs/antlr-c: multilib--, static-libs--
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild | 18 ++++++++++--------
dev-libs/antlr-c/files/3.5-cflags.patch | 5 ++---
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild
b/dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild
index b073fe00848..e0b7a34e56f 100644
--- a/dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild
+++ b/dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit eutils autotools multilib-minimal
+inherit autotools multilib-minimal
MY_PN="${PN%-c}"
DESCRIPTION="The ANTLR3 C Runtime"
HOMEPAGE="https://www.antlr3.org/";
SRC_URI="https://github.com/${MY_PN}/${MY_PN}3/archive/${PV}.tar.gz ->
${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}3-${PV}/runtime/C"
+
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug debugger doc static-libs"
+IUSE="debug debugger doc"
-DEPEND="doc? ( app-doc/doxygen[dot] )"
-RDEPEND=""
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
-S="${WORKDIR}/${MY_PN}3-${PV}/runtime/C"
PATCHES=( "${FILESDIR}/3.5-cflags.patch" )
MULTILIB_WRAPPED_HEADERS=( /usr/include/antlr3config.h )
DOCS=( AUTHORS ChangeLog NEWS README )
@@ -32,9 +32,9 @@ src_prepare() {
multilib_src_configure() {
local econfargs=(
--enable-shared
+ --disable-static
$(use_enable debug debuginfo)
$(use_enable debugger antlrdebug)
- $(use_enable static-libs static)
)
case "${ABI}" in
@@ -58,6 +58,8 @@ src_compile() {
src_install() {
use doc && HTML_DOCS=( "${S}/api/" )
+
multilib-minimal_src_install
- find "${D}" -name '*.la' -delete || die
+
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/dev-libs/antlr-c/files/3.5-cflags.patch
b/dev-libs/antlr-c/files/3.5-cflags.patch
index 85451331182..a2e91397b2e 100644
--- a/dev-libs/antlr-c/files/3.5-cflags.patch
+++ b/dev-libs/antlr-c/files/3.5-cflags.patch
@@ -1,6 +1,5 @@
-diff -ur libantlr3c-3.3-SNAPSHOT.old//configure.ac
libantlr3c-3.3-SNAPSHOT/configure.ac
---- libantlr3c-3.3-SNAPSHOT.old//configure.ac 2011-04-03 10:40:51.277000042
+0300
-+++ libantlr3c-3.3-SNAPSHOT/configure.ac 2011-04-03 10:41:22.092000042
+0300
+--- a/configure.ac
++++ b/configure.ac
@@ -134,8 +134,8 @@
;;
esac
