* [gentoo-commits] repo/gentoo:master commit in: dev-libs/link-grammar/, dev-libs/link-grammar/files/
@ 2020-08-16 11:46 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2020-08-16 11:46 UTC (permalink / raw
To: gentoo-commits
commit: f895567e762f8f068a525b9294446f14938eab0e
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 11:46:33 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 11:46:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f895567e
dev-libs/link-grammar: Version bump to 5.8.0
* EAPI 7
* Supports Python 3.6/3.7/3.8/3.9
Bug: https://bugs.gentoo.org/718282
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-libs/link-grammar/Manifest | 1 +
.../files/link-grammar-5.8.0-dont-inject-O3.patch | 23 ++++
.../link-grammar-5.8.0-out-of-source-build.patch | 33 ++++++
dev-libs/link-grammar/link-grammar-5.8.0.ebuild | 125 +++++++++++++++++++++
4 files changed, 182 insertions(+)
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 97d340e7ab7..8e5e8d34970 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1 +1,2 @@
DIST link-grammar-5.3.11.tar.gz 3632617 BLAKE2B 07fe951743096a0d6b906c9b7174b58fcc54b0e2c54805d15731de783888327799fd77f64a2ae7f4e09327feb08d91cb95471e9c0c3c2fe00fca3553f40b1905 SHA512 09671d187deac3b9530dd63eb4497de9c2c9db32d79da06c677bdbccac015adef06813819692a92d15499c7cb347071c58b73c52505af154bdc8a8fcd409ddd2
+DIST link-grammar-5.8.0.tar.gz 3782125 BLAKE2B 8027e91212d3269b8e3ceaa5c837ad961cd2dfd92849d3989094ab771d97d30f4b228cfc1e32e9e843676aa439d790fb444823f7db69004538ad068c7bf28a45 SHA512 1262e2faf1de6f05a62f9d622f43c02253b4c241342df9b443a70ae04bd328d1fc49cd2f91c881e694f67215005833fec8b1fa9d395b1e547985b376c7415d2e
diff --git a/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch b/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch
new file mode 100644
index 00000000000..2d97b7cc762
--- /dev/null
+++ b/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch
@@ -0,0 +1,23 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -137,8 +137,7 @@
+ AC_SUBST(HOST_OS)
+ # ====================================================================
+
+-CFLAGS="${CFLAGS} -O3"
+-CXXFLAGS="${CXXFLAGS} -O3 -Wall"
++CXXFLAGS="${CXXFLAGS} -Wall"
+
+ # The std=c11 flag provides the proper float-pt math decls working,
+ # e.g. fmax However, it also undefined _BSD_SOURCE, etc. which is
+@@ -908,10 +907,6 @@
+
+ AC_FUNC_STRERROR_R
+
+-AC_SUBST(CFLAGS)
+-AC_SUBST(CPPFLAGS)
+-AC_SUBST(CXXFLAGS)
+-
+ dnl Save the compilation definitions for an extended version printout
+ AC_OUTPUT_MAKE_DEFS()
+ LG_DEFS=`$ECHO "$DEFS" | $SED 's/\\\\//g'`
diff --git a/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch b/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch
new file mode 100644
index 00000000000..1616e933664
--- /dev/null
+++ b/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch
@@ -0,0 +1,33 @@
+--- a/bindings/python/Makefile.am
++++ b/bindings/python/Makefile.am
+@@ -4,8 +4,8 @@
+ # Created by Linas Vepstas February 2014
+ #
+ #
+-SWIG_SOURCES = ../swig/link_grammar.i
+-SWIG_INCLUDES = ../../link-grammar/link-includes.h
++SWIG_SOURCES = $(top_srcdir)/bindings/swig/link_grammar.i
++SWIG_INCLUDES = $(top_srcdir)/link-grammar/link-includes.h
+ built_c_sources = lg_python_wrap.cc
+ built_py_sources = $(top_builddir)/bindings/python/clinkgrammar.py
+
+@@ -18,16 +18,16 @@
+
+ # Files that get installed in $pkgpythondir
+ pkgpython_PYTHON = \
+- linkgrammar.py \
++ $(srcdir)/linkgrammar.py \
+ $(top_builddir)/bindings/python/__init__.py \
+- $(top_builddir)/bindings/python/clinkgrammar.py
++ $(built_py_sources)
+
+ # Apparently, anaconda does not work without this!?
+ # This seems wrong and lame to me, but see issue #298
+ # https://github.com/opencog/link-grammar/issues/298
+ pkgpypathdir=$(pythondir)
+ pkgpypath_PYTHON = \
+- linkgrammar.pth
++ $(srcdir)/linkgrammar.pth
+
+ # The make uninstall target should remove directories we created.
+ uninstall-hook:
diff --git a/dev-libs/link-grammar/link-grammar-5.8.0.ebuild b/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
new file mode 100644
index 00000000000..6434d2d8be2
--- /dev/null
+++ b/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools java-pkg-opt-2 python-r1 out-of-source
+
+DESCRIPTION="A Syntactic English parser"
+HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
+SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aspell +hunspell java python" # pcre
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# XXX: sqlite is automagic
+# Does not build with >=sci-mathematics/minisat-2, bug #593662
+# add pcre support: pcre? ( dev-libs/libpcre )
+RDEPEND="
+ dev-db/sqlite:3
+ aspell? ( app-text/aspell )
+ hunspell? ( app-text/hunspell )
+ java? (
+ >=virtual/jdk-1.6:*
+ dev-java/ant-core
+ )
+ python? ( ${PYTHON_DEPS} )
+ !sci-mathematics/minisat"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/swig:0
+ sys-devel/autoconf-archive
+ virtual/pkgconfig"
+
+pkg_setup() {
+ if use aspell && use hunspell; then
+ ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
+ ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
+ ewarn "you want aspell support."
+ fi
+ use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ use java && java-pkg-opt-2_src_prepare
+
+ # http://bugzilla.abisource.com/show_bug.cgi?id=13806
+ eapply "${FILESDIR}"/${PN}-5.8.0-out-of-source-build.patch
+ eapply "${FILESDIR}"/${PN}-5.8.0-dont-inject-O3.patch
+ eapply_user
+
+ eautoreconf
+}
+
+my_src_configure() {
+ local myconf=(
+ --disable-maintainer-mode
+ --disable-editline
+ --disable-perl-bindings
+ --disable-static
+ --enable-sat-solver=bundled
+ $(use_enable aspell)
+ $(use_enable hunspell)
+ $(usex hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell '')
+ $(use_enable java java-bindings)
+ # $(use_enable pcre regex-tokenizer)
+ # $(use_with pcre)
+ )
+
+ econf \
+ --disable-python-bindings \
+ "${myconf[@]}"
+
+ if use python; then
+ python_configure() {
+ econf \
+ --enable-python-bindings \
+ "${myconf[@]}"
+ }
+ python_foreach_impl run_in_build_dir python_configure
+ fi
+}
+
+my_src_compile() {
+ local -x MAIN_BUILD_DIR="${BUILD_DIR}"
+ default
+
+ if use python; then
+ python_compile() {
+ emake -C bindings/python \
+ VPATH="${S}:${MAIN_BUILD_DIR}" \
+ _clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+ _clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la
+ }
+ python_foreach_impl run_in_build_dir python_compile
+ fi
+}
+
+my_src_install() {
+ local -x MAIN_BUILD_DIR="${BUILD_DIR}"
+ default
+
+ if use python; then
+ python_install() {
+ emake -C bindings/python \
+ VPATH="${S}:${MAIN_BUILD_DIR}" \
+ _clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+ _clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+ DESTDIR="${D}" \
+ install
+ }
+ python_foreach_impl run_in_build_dir python_install
+ fi
+
+ # no static archives
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+ use java && java-pkg-opt-2_pkg_preinst
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/link-grammar/, dev-libs/link-grammar/files/
@ 2020-09-28 19:50 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2020-09-28 19:50 UTC (permalink / raw
To: gentoo-commits
commit: a948a0ca71cf73f153fbd0eaa61b09e0a469a2c2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 28 19:40:36 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 28 19:40:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a948a0ca
dev-libs/link-grammar: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-libs/link-grammar/Manifest | 1 -
.../link-grammar-5.3.9-out-of-source-build.patch | 61 ---------
dev-libs/link-grammar/link-grammar-5.3.11.ebuild | 143 ---------------------
3 files changed, 205 deletions(-)
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 8e5e8d34970..d2a2a33c0e8 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,2 +1 @@
-DIST link-grammar-5.3.11.tar.gz 3632617 BLAKE2B 07fe951743096a0d6b906c9b7174b58fcc54b0e2c54805d15731de783888327799fd77f64a2ae7f4e09327feb08d91cb95471e9c0c3c2fe00fca3553f40b1905 SHA512 09671d187deac3b9530dd63eb4497de9c2c9db32d79da06c677bdbccac015adef06813819692a92d15499c7cb347071c58b73c52505af154bdc8a8fcd409ddd2
DIST link-grammar-5.8.0.tar.gz 3782125 BLAKE2B 8027e91212d3269b8e3ceaa5c837ad961cd2dfd92849d3989094ab771d97d30f4b228cfc1e32e9e843676aa439d790fb444823f7db69004538ad068c7bf28a45 SHA512 1262e2faf1de6f05a62f9d622f43c02253b4c241342df9b443a70ae04bd328d1fc49cd2f91c881e694f67215005833fec8b1fa9d395b1e547985b376c7415d2e
diff --git a/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch b/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch
deleted file mode 100644
index 6eacc6610f9..00000000000
--- a/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/bindings/python/Makefile.am 2016-08-26 04:28:48.000000000 +0200
-+++ b/bindings/python/Makefile.am 2016-09-10 16:13:33.554781694 +0200
-@@ -4,9 +4,8 @@
- # Created by Linas Vepstas February 2014
- #
-
--SWIG_SOURCES = ../swig/link_grammar.i
--# BUILT_C_SOURCES = $(top_builddir)/bindings/python/lg_python_wrap.cc
--BUILT_C_SOURCES = ../../bindings/python/lg_python_wrap.cc
-+SWIG_SOURCES = $(top_srcdir)/bindings/swig/link_grammar.i
-+BUILT_C_SOURCES = $(top_builddir)/bindings/python/lg_python_wrap.cc
- BUILT_PY_SOURCES = $(top_builddir)/bindings/python/clinkgrammar.py
-
- # Over-ride the install location, so as to remove the dash in the
-@@ -20,7 +19,7 @@
- pkgpython_PYTHON = \
-- linkgrammar.py \
-+ $(srcdir)/linkgrammar.py \
- $(top_builddir)/bindings/python/__init__.py \
-- $(top_builddir)/bindings/python/clinkgrammar.py
-+ $(BUILT_PY_SOURCES)
-
-
- # These are packaged in the tarball; make clean should not remove them.
---- a/bindings/python3/Makefile.am 2016-08-26 04:28:48.000000000 +0200
-+++ b/bindings/python3/Makefile.am 2016-09-11 01:30:35.700926275 +0200
-@@ -4,9 +4,8 @@
- # Created by Linas Vepstas February 2014
- #
-
--SWIG_SOURCES = ../swig/link_grammar.i
--# BUILT_C_SOURCES = $(top_builddir)/bindings/python3/lg_python_wrap.cc
--BUILT_C_SOURCES = ../../bindings/python3/lg_python_wrap.cc
-+SWIG_SOURCES = $(top_srcdir)/bindings/swig/link_grammar.i
-+BUILT_C_SOURCES = $(top_builddir)/bindings/python3/lg_python_wrap.cc
- BUILT_PY_SOURCES = $(top_builddir)/bindings/python3/clinkgrammar.py
-
- # Over-ride the install location, so as to remove the dash in the
-@@ -18,9 +17,9 @@
-
- # Files that get installed in $pkgpythondir
- pkgpython3_PYTHON = \
-- ../../bindings/python/linkgrammar.py \
-+ $(top_srcdir)/bindings/python/linkgrammar.py \
- $(top_builddir)/bindings/python3/__init__.py \
-- $(top_builddir)/bindings/python3/clinkgrammar.py
-+ $(BUILT_PY_SOURCES)
-
-
- # Apparently, anaconda does not work without this!?
---- a/bindings/python3/Makefile.am 2016-09-11 12:44:01.466971878 +0200
-+++ b/bindings/python3/Makefile.am 2016-09-11 12:44:22.385788941 +0200
-@@ -26,7 +26,7 @@
- # This seems wrong and lme to me, but see issue #298
- pkgpypathdir=$(pythondir)
- pkgpypath_PYTHON = \
-- linkgrammar.pth
-+ $(srcdir)/linkgrammar.pth
-
- # These are packaged in the tarball; make clean should not remove them.
- maintainer-clean-local:
diff --git a/dev-libs/link-grammar/link-grammar-5.3.11.ebuild b/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
deleted file mode 100644
index ddab5316ca1..00000000000
--- a/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools eutils gnome2 java-pkg-opt-2 python-r1
-
-DESCRIPTION="A Syntactic English parser"
-HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
-SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE="aspell +hunspell java python static-libs threads" # pcre
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# XXX: sqlite is automagic
-# Does not build with >=sci-mathematics/minisat-2, bug #593662
-# add pcre support: pcre? ( dev-libs/libpcre )
-RDEPEND="
- dev-db/sqlite:3
- aspell? ( app-text/aspell )
- hunspell? ( app-text/hunspell )
- java? (
- >=virtual/jdk-1.6:*
- dev-java/ant-core )
- python? ( ${PYTHON_DEPS} )
- !sci-mathematics/minisat
-"
-DEPEND="${RDEPEND}
- dev-lang/swig:0
- sys-devel/autoconf-archive
- virtual/pkgconfig
-"
-
-NORMAL_BUILD_DIR="${WORKDIR}/${P}-normal"
-
-pkg_setup() {
- if use aspell && use hunspell; then
- ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
- ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
- ewarn "you want aspell support."
- fi
- use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- use java && java-pkg-opt-2_src_prepare
-
- # http://bugzilla.abisource.com/show_bug.cgi?id=13806
- eapply "${FILESDIR}"/${PN}-5.3.9-out-of-source-build.patch
- eapply_user
- eautoreconf
-
- if use python ; then
- prepare_python() {
- mkdir -p "${BUILD_DIR}" || die
- }
- python_foreach_impl prepare_python
- fi
-
- mkdir -p "${NORMAL_BUILD_DIR}" || die
- gnome2_src_prepare
-}
-
-src_configure() {
- local myconf=(
- --disable-editline
- --disable-perl-bindings
- --enable-shared
- --enable-sat-solver=bundled
- $(use_enable aspell)
- $(use_enable hunspell)
- $(usex hunspell --with-hunspell-dictdir=/usr/share/myspell)
- $(use_enable java java-bindings)
- # $(use_enable pcre regex-tokenizer)
- # $(use_with pcre)
- $(use_enable static-libs static)
- $(use_enable threads pthreads)
- )
-
- cd "${NORMAL_BUILD_DIR}" || die
- ECONF_SOURCE="${S}" gnome2_src_configure \
- --disable-python-bindings \
- --disable-python3-bindings \
- ${myconf[@]}
-
- if use python ; then
- prepare_python() {
- ECONF_SOURCE="${S}" gnome2_src_configure \
- --disable-python-bindings \
- --enable-python3-bindings \
- ${myconf[@]}
- }
- python_foreach_impl run_in_build_dir prepare_python
- fi
-}
-
-src_compile() {
- cd "${NORMAL_BUILD_DIR}" || die
- gnome2_src_compile
-
- if use python ; then
- compile_binding() {
- emake -C bindings/python3 \
- VPATH="${S}:${NORMAL_BUILD_DIR}" \
- _clinkgrammar_la_DEPENDENCIES="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \
- _clinkgrammar_la_LIBADD="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la
- }
- python_foreach_impl run_in_build_dir compile_binding
- fi
-}
-
-src_test() {
- cd "${NORMAL_BUILD_DIR}" || die
- ln -s "${S}"/data tests/data || die
- emake check
-}
-
-src_install() {
- cd "${NORMAL_BUILD_DIR}" || die
- gnome2_src_install
-
- if use python ; then
- install_binding() {
- emake -C bindings/python3 \
- VPATH="${S}:${NORMAL_BUILD_DIR}" \
- _clinkgrammar_la_DEPENDENCIES="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \
- _clinkgrammar_la_LIBADD="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \
- DESTDIR="${D}" \
- install
- }
- python_foreach_impl run_in_build_dir install_binding
- fi
-}
-
-pkg_preinst() {
- use java && java-pkg-opt-2_pkg_preinst
- gnome2_pkg_preinst
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/link-grammar/, dev-libs/link-grammar/files/
@ 2021-04-19 9:48 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2021-04-19 9:48 UTC (permalink / raw
To: gentoo-commits
commit: 9bcbb1d0be1c5057472067b8e641c4fbdcaafe44
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 09:47:35 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 09:47:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bcbb1d0
dev-libs/link-grammar: Bump to 5.8.1
Closes: https://bugs.gentoo.org/729908
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-libs/link-grammar/Manifest | 1 +
.../files/link-grammar-5.8.1-lld.patch | 13 +++
dev-libs/link-grammar/link-grammar-5.8.1.ebuild | 123 +++++++++++++++++++++
3 files changed, 137 insertions(+)
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index d2a2a33c0e8..2101dd3b0ce 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1 +1,2 @@
DIST link-grammar-5.8.0.tar.gz 3782125 BLAKE2B 8027e91212d3269b8e3ceaa5c837ad961cd2dfd92849d3989094ab771d97d30f4b228cfc1e32e9e843676aa439d790fb444823f7db69004538ad068c7bf28a45 SHA512 1262e2faf1de6f05a62f9d622f43c02253b4c241342df9b443a70ae04bd328d1fc49cd2f91c881e694f67215005833fec8b1fa9d395b1e547985b376c7415d2e
+DIST link-grammar-5.8.1.tar.gz 3791847 BLAKE2B 8c89b95eaae87f0b576374c3f8c00529d61b62004718424d1ac1a41b694d8b56ba75d0a7068e1411376c260781f5adae8512976a6572e54f18d84abe98c1839e SHA512 0ef99d3ccb3d922a946f1f73b8b81cee9ece156886dab3367837e1e9f79944967da1391daf7f96ea5a95a0abdd346b642111a7939eb9aa079557c10b3efe8022
diff --git a/dev-libs/link-grammar/files/link-grammar-5.8.1-lld.patch b/dev-libs/link-grammar/files/link-grammar-5.8.1-lld.patch
new file mode 100644
index 00000000000..af48d251046
--- /dev/null
+++ b/dev-libs/link-grammar/files/link-grammar-5.8.1-lld.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -324,9 +324,7 @@
+ dnl 1. Abort and notify if no zlib.h. 2. Adapt for non-standard location.
+ AC_MSG_NOTICE([The minisat2 headers include zlib.h])
+ dnl The bundled library doesn't actually need -lz
+- AX_CHECK_ZLIB([ZLIB_CPPFLAGS="-isystem $ZLIB_HOME/include"],
+- [AC_MSG_NOTICE([No zlib library found - not building sat solver])
+- enable_sat_solver=no])
++ PKG_CHECK_MODULES([ZLIB], [zlib], [ZLIB_CPPFLAGS="${ZLIB_CFLAGS}"])
+ fi
+
+ # If zlib not found, then don't continue with minisat.
diff --git a/dev-libs/link-grammar/link-grammar-5.8.1.ebuild b/dev-libs/link-grammar/link-grammar-5.8.1.ebuild
new file mode 100644
index 00000000000..2cdb1a11a0e
--- /dev/null
+++ b/dev-libs/link-grammar/link-grammar-5.8.1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools java-pkg-opt-2 python-r1 out-of-source
+
+DESCRIPTION="A Syntactic English parser"
+HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
+SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aspell +hunspell java python" # pcre
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# XXX: sqlite is automagic
+# Does not build with >=sci-mathematics/minisat-2, bug #593662
+# add pcre support: pcre? ( dev-libs/libpcre )
+RDEPEND="
+ dev-db/sqlite:3
+ aspell? ( app-text/aspell )
+ hunspell? ( app-text/hunspell )
+ java? (
+ >=virtual/jdk-1.6:*
+ dev-java/ant-core
+ )
+ python? ( ${PYTHON_DEPS} )
+ !sci-mathematics/minisat"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/swig:0
+ sys-devel/autoconf-archive
+ virtual/pkgconfig"
+
+pkg_setup() {
+ if use aspell && use hunspell; then
+ ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
+ ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
+ ewarn "you want aspell support."
+ fi
+ use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ default
+ use java && java-pkg-opt-2_src_prepare
+
+ eapply "${FILESDIR}"/${P}-lld.patch
+
+ eautoreconf
+}
+
+my_src_configure() {
+ local myconf=(
+ --disable-maintainer-mode
+ --disable-editline
+ --disable-perl-bindings
+ --disable-static
+ --enable-sat-solver=bundled
+ $(use_enable aspell)
+ $(use_enable hunspell)
+ $(usex hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell '')
+ $(use_enable java java-bindings)
+ # $(use_enable pcre regex-tokenizer)
+ # $(use_with pcre)
+ )
+
+ econf \
+ --disable-python-bindings \
+ "${myconf[@]}"
+
+ if use python; then
+ python_configure() {
+ econf \
+ --enable-python-bindings \
+ "${myconf[@]}"
+ }
+ python_foreach_impl run_in_build_dir python_configure
+ fi
+}
+
+my_src_compile() {
+ local -x MAIN_BUILD_DIR="${BUILD_DIR}"
+ default
+
+ if use python; then
+ python_compile() {
+ emake -C bindings/python \
+ VPATH="${S}:${MAIN_BUILD_DIR}" \
+ _clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+ _clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la
+ }
+ python_foreach_impl run_in_build_dir python_compile
+ fi
+}
+
+my_src_install() {
+ local -x MAIN_BUILD_DIR="${BUILD_DIR}"
+ default
+
+ if use python; then
+ python_install() {
+ emake -C bindings/python \
+ VPATH="${S}:${MAIN_BUILD_DIR}" \
+ _clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+ _clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+ DESTDIR="${D}" \
+ install
+ }
+ python_foreach_impl run_in_build_dir python_install
+ fi
+
+ # no static archives
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+ use java && java-pkg-opt-2_pkg_preinst
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/link-grammar/, dev-libs/link-grammar/files/
@ 2022-03-19 17:10 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2022-03-19 17:10 UTC (permalink / raw
To: gentoo-commits
commit: ad8536d25c49a1620a9db311cf1f1cfa92de300d
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 17:10:04 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 17:10:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad8536d2
dev-libs/link-grammar: drop 5.8.0
Closes: https://bugs.gentoo.org/745168
Closes: https://bugs.gentoo.org/806157
Closes: https://bugs.gentoo.org/806160
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-libs/link-grammar/Manifest | 1 -
.../files/link-grammar-5.8.0-dont-inject-O3.patch | 23 ----
.../link-grammar-5.8.0-out-of-source-build.patch | 33 ------
dev-libs/link-grammar/link-grammar-5.8.0.ebuild | 125 ---------------------
4 files changed, 182 deletions(-)
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 38689ac58720..3a97a6932144 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,3 +1,2 @@
DIST link-grammar-5.10.2.tar.gz 3853934 BLAKE2B d2cb64a6b0146f40ce5b197c21ded94f1256360615c2332a1c546f6b6c71c98d2500e97b0fcabae964377a04143fa13ba3af324f2de729cfccd280e53f6fb7c3 SHA512 71bc881cb628fe1898403024d8e949b2fbf44f5d20445f6fff7bb6038646840556d734434beb7eb43b63f661e18333657deaeb1b8c96b50d5fe3b6ef727565c2
DIST link-grammar-5.10.4.tar.gz 4593602 BLAKE2B 0515aed27ae8df85ceddb9685ce90db2b6e7671235b9b445b6728b1ac417d6d43b3705566066ff9735fc98c32746342c224f2399bb0f2573784f20b5f998e7be SHA512 a215694f76e15286c478884ea8a13b32976d06ea45d10897dc1b303f256a2c0af94c9f90da26b314ce5e03009b494ab526c729b66f2b1ed46ff3e8b02cb6fd08
-DIST link-grammar-5.8.0.tar.gz 3782125 BLAKE2B 8027e91212d3269b8e3ceaa5c837ad961cd2dfd92849d3989094ab771d97d30f4b228cfc1e32e9e843676aa439d790fb444823f7db69004538ad068c7bf28a45 SHA512 1262e2faf1de6f05a62f9d622f43c02253b4c241342df9b443a70ae04bd328d1fc49cd2f91c881e694f67215005833fec8b1fa9d395b1e547985b376c7415d2e
diff --git a/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch b/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch
deleted file mode 100644
index 2d97b7cc7627..000000000000
--- a/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -137,8 +137,7 @@
- AC_SUBST(HOST_OS)
- # ====================================================================
-
--CFLAGS="${CFLAGS} -O3"
--CXXFLAGS="${CXXFLAGS} -O3 -Wall"
-+CXXFLAGS="${CXXFLAGS} -Wall"
-
- # The std=c11 flag provides the proper float-pt math decls working,
- # e.g. fmax However, it also undefined _BSD_SOURCE, etc. which is
-@@ -908,10 +907,6 @@
-
- AC_FUNC_STRERROR_R
-
--AC_SUBST(CFLAGS)
--AC_SUBST(CPPFLAGS)
--AC_SUBST(CXXFLAGS)
--
- dnl Save the compilation definitions for an extended version printout
- AC_OUTPUT_MAKE_DEFS()
- LG_DEFS=`$ECHO "$DEFS" | $SED 's/\\\\//g'`
diff --git a/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch b/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch
deleted file mode 100644
index 1616e933664e..000000000000
--- a/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/bindings/python/Makefile.am
-+++ b/bindings/python/Makefile.am
-@@ -4,8 +4,8 @@
- # Created by Linas Vepstas February 2014
- #
- #
--SWIG_SOURCES = ../swig/link_grammar.i
--SWIG_INCLUDES = ../../link-grammar/link-includes.h
-+SWIG_SOURCES = $(top_srcdir)/bindings/swig/link_grammar.i
-+SWIG_INCLUDES = $(top_srcdir)/link-grammar/link-includes.h
- built_c_sources = lg_python_wrap.cc
- built_py_sources = $(top_builddir)/bindings/python/clinkgrammar.py
-
-@@ -18,16 +18,16 @@
-
- # Files that get installed in $pkgpythondir
- pkgpython_PYTHON = \
-- linkgrammar.py \
-+ $(srcdir)/linkgrammar.py \
- $(top_builddir)/bindings/python/__init__.py \
-- $(top_builddir)/bindings/python/clinkgrammar.py
-+ $(built_py_sources)
-
- # Apparently, anaconda does not work without this!?
- # This seems wrong and lame to me, but see issue #298
- # https://github.com/opencog/link-grammar/issues/298
- pkgpypathdir=$(pythondir)
- pkgpypath_PYTHON = \
-- linkgrammar.pth
-+ $(srcdir)/linkgrammar.pth
-
- # The make uninstall target should remove directories we created.
- uninstall-hook:
diff --git a/dev-libs/link-grammar/link-grammar-5.8.0.ebuild b/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
deleted file mode 100644
index 0b97d446d773..000000000000
--- a/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools java-pkg-opt-2 python-r1 out-of-source
-
-DESCRIPTION="A Syntactic English parser"
-HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
-SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE="aspell +hunspell java python" # pcre
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# XXX: sqlite is automagic
-# Does not build with >=sci-mathematics/minisat-2, bug #593662
-# add pcre support: pcre? ( dev-libs/libpcre )
-RDEPEND="
- dev-db/sqlite:3
- aspell? ( app-text/aspell )
- hunspell? ( app-text/hunspell )
- java? (
- >=virtual/jdk-1.6:*
- dev-java/ant-core
- )
- python? ( ${PYTHON_DEPS} )
- !sci-mathematics/minisat"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-lang/swig:0
- sys-devel/autoconf-archive
- virtual/pkgconfig"
-
-pkg_setup() {
- if use aspell && use hunspell; then
- ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
- ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
- ewarn "you want aspell support."
- fi
- use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- use java && java-pkg-opt-2_src_prepare
-
- # http://bugzilla.abisource.com/show_bug.cgi?id=13806
- eapply "${FILESDIR}"/${PN}-5.8.0-out-of-source-build.patch
- eapply "${FILESDIR}"/${PN}-5.8.0-dont-inject-O3.patch
- eapply_user
-
- eautoreconf
-}
-
-my_src_configure() {
- local myconf=(
- --disable-maintainer-mode
- --disable-editline
- --disable-perl-bindings
- --disable-static
- --enable-sat-solver=bundled
- $(use_enable aspell)
- $(use_enable hunspell)
- $(usex hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell '')
- $(use_enable java java-bindings)
- # $(use_enable pcre regex-tokenizer)
- # $(use_with pcre)
- )
-
- econf \
- --disable-python-bindings \
- "${myconf[@]}"
-
- if use python; then
- python_configure() {
- econf \
- --enable-python-bindings \
- "${myconf[@]}"
- }
- python_foreach_impl run_in_build_dir python_configure
- fi
-}
-
-my_src_compile() {
- local -x MAIN_BUILD_DIR="${BUILD_DIR}"
- default
-
- if use python; then
- python_compile() {
- emake -C bindings/python \
- VPATH="${S}:${MAIN_BUILD_DIR}" \
- _clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
- _clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la
- }
- python_foreach_impl run_in_build_dir python_compile
- fi
-}
-
-my_src_install() {
- local -x MAIN_BUILD_DIR="${BUILD_DIR}"
- default
-
- if use python; then
- python_install() {
- emake -C bindings/python \
- VPATH="${S}:${MAIN_BUILD_DIR}" \
- _clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
- _clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
- DESTDIR="${D}" \
- install
- }
- python_foreach_impl run_in_build_dir python_install
- fi
-
- # no static archives
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
- use java && java-pkg-opt-2_pkg_preinst
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/link-grammar/, dev-libs/link-grammar/files/
@ 2022-11-13 17:12 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2022-11-13 17:12 UTC (permalink / raw
To: gentoo-commits
commit: 41d43de3f4d395f57cb34db2a66e00218e0b1fee
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 13 17:11:51 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 17:11:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41d43de3
dev-libs/link-grammar: drop 5.10.5-r1
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-libs/link-grammar/Manifest | 1 -
.../files/link-grammar-5.8.1-lld.patch | 13 ---
.../link-grammar/link-grammar-5.10.5-r1.ebuild | 111 ---------------------
3 files changed, 125 deletions(-)
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 57fee7077469..05c86a167613 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,2 +1 @@
-DIST link-grammar-5.10.5.tar.gz 4637765 BLAKE2B d280a06492462725c9c62352b6bf4fb0a11a09b2b3049e41d9a078fa2ad37c8ef0f0e99e05039e355e81d127c168024068319a4fcf64caa840c00c165ed22f11 SHA512 09774f7ce01bc7ec9912162297c9b7be176e655b70981a147d53245c015f62581e7f45c005d0590d1a65e870e3c2ac4288517012fd9caa9887e4fd86d8e6aa05
DIST link-grammar-5.11.0.tar.gz 4672430 BLAKE2B 35892e05805a83ebbd700611d19aaa9ad1ede4ba3baf60c85ef8e5abbc40134fcb71d9cb9f41518f663c60ad11aac7bd0b316c8c95a12631032f5ad79564d686 SHA512 6a24bc8d5c9f0dd63460c092fc46880503018e949aa277148f8f551d6cc9d929d3a981eeaba00afc6e618c1e4505438d0c7e9a57dfe7a8deb7d3a8f183c56636
diff --git a/dev-libs/link-grammar/files/link-grammar-5.8.1-lld.patch b/dev-libs/link-grammar/files/link-grammar-5.8.1-lld.patch
deleted file mode 100644
index af48d251046b..000000000000
--- a/dev-libs/link-grammar/files/link-grammar-5.8.1-lld.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -324,9 +324,7 @@
- dnl 1. Abort and notify if no zlib.h. 2. Adapt for non-standard location.
- AC_MSG_NOTICE([The minisat2 headers include zlib.h])
- dnl The bundled library doesn't actually need -lz
-- AX_CHECK_ZLIB([ZLIB_CPPFLAGS="-isystem $ZLIB_HOME/include"],
-- [AC_MSG_NOTICE([No zlib library found - not building sat solver])
-- enable_sat_solver=no])
-+ PKG_CHECK_MODULES([ZLIB], [zlib], [ZLIB_CPPFLAGS="${ZLIB_CFLAGS}"])
- fi
-
- # If zlib not found, then don't continue with minisat.
diff --git a/dev-libs/link-grammar/link-grammar-5.10.5-r1.ebuild b/dev-libs/link-grammar/link-grammar-5.10.5-r1.ebuild
deleted file mode 100644
index 9de3fa2672c1..000000000000
--- a/dev-libs/link-grammar/link-grammar-5.10.5-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit autotools python-r1 out-of-source
-
-DESCRIPTION="A Syntactic English parser"
-HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
-SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
-IUSE="aspell +hunspell python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# XXX: sqlite is automagic
-# Does not build with >=sci-mathematics/minisat-2, bug #593662
-RDEPEND="
- dev-db/sqlite:3
- dev-libs/libpcre2:=
- aspell? ( app-text/aspell )
- hunspell? ( app-text/hunspell )
- python? ( ${PYTHON_DEPS} )
- !sci-mathematics/minisat"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-lang/swig:0
- sys-devel/autoconf-archive
- virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.8.1-lld.patch )
-
-pkg_setup() {
- if use aspell && use hunspell; then
- ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
- ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
- ewarn "you want aspell support."
- fi
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-my_src_configure() {
- local myconf=(
- --disable-maintainer-mode
- --disable-editline
- # java is hopelessly broken, invokes maven at build time (bug #806157)
- --disable-java-bindings
- --disable-perl-bindings
- --enable-sat-solver=bundled
- --with-regexlib=pcre2
- $(use_enable aspell)
- $(use_enable hunspell)
- $(usev hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell)
- )
-
- econf \
- --disable-python-bindings \
- "${myconf[@]}"
-
- if use python; then
- python_configure() {
- econf \
- --enable-python-bindings \
- "${myconf[@]}"
- }
- python_foreach_impl run_in_build_dir python_configure
- fi
-}
-
-my_src_compile() {
- local -x MAIN_BUILD_DIR="${BUILD_DIR}"
- default
-
- if use python; then
- python_compile() {
- emake -C bindings/python \
- VPATH="${S}:${MAIN_BUILD_DIR}" \
- _clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
- _clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la
- }
- python_foreach_impl run_in_build_dir python_compile
- fi
-}
-
-my_src_install() {
- local -x MAIN_BUILD_DIR="${BUILD_DIR}"
- default
-
- if use python; then
- python_install() {
- emake -C bindings/python \
- VPATH="${S}:${MAIN_BUILD_DIR}" \
- _clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
- _clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
- DESTDIR="${D}" \
- install
- }
- python_foreach_impl run_in_build_dir python_install
- fi
-
- # no static archives
- find "${ED}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/link-grammar/, dev-libs/link-grammar/files/
@ 2023-05-07 18:36 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2023-05-07 18:36 UTC (permalink / raw
To: gentoo-commits
commit: e654b5e511fa528838ce055239a7a6f9f704b339
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun May 7 18:35:20 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun May 7 18:35:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e654b5e5
dev-libs/link-grammar: add upstreamed patch
Closes: https://bugs.gentoo.org/903749
Signed-off-by: David Seifert <soap <AT> gentoo.org>
...mar-5.12.3-Wimplicit-function-declaration.patch | 35 ++++++++++++++++++++++
dev-libs/link-grammar/link-grammar-5.12.3.ebuild | 5 ++++
2 files changed, 40 insertions(+)
diff --git a/dev-libs/link-grammar/files/link-grammar-5.12.3-Wimplicit-function-declaration.patch b/dev-libs/link-grammar/files/link-grammar-5.12.3-Wimplicit-function-declaration.patch
new file mode 100644
index 000000000000..55ca89c09b94
--- /dev/null
+++ b/dev-libs/link-grammar/files/link-grammar-5.12.3-Wimplicit-function-declaration.patch
@@ -0,0 +1,35 @@
+From 3cbc9ddfd4c3a3e407338619fa383d24da05b23d Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sun, 7 May 2023 16:02:23 +0200
+Subject: [PATCH] Use correct guard macro for glibc heap functions
+
+* `__GNUC__` == Compiling with `-std=gnu*`
+* `__GLIBC__` == Compiling against glibc
+
+Bug: https://bugs.gentoo.org/903749
+---
+ link-grammar/parse/extract-links.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/link-grammar/parse/extract-links.c b/link-grammar/parse/extract-links.c
+index a6129ac7a..e2ce266bc 100644
+--- a/link-grammar/parse/extract-links.c
++++ b/link-grammar/parse/extract-links.c
+@@ -278,7 +278,7 @@ void free_extractor(extractor_t * pex)
+ pex->x_table_size = 0;
+ pex->x_table = NULL;
+
+-#if defined __GNUC__
++#if defined __GLIBC__
+ // MST parsing can result in pathological cases, with almost a
+ // billion elts in the Parse_choice_pool. This blows up the
+ // resident-set size (RSS) over time. Avoid this issue by trimming.
+@@ -294,7 +294,7 @@ void free_extractor(extractor_t * pex)
+
+ xfree((void *) pex, sizeof(extractor_t));
+
+-#if defined __GNUC__
++#if defined __GLIBC__
+ // malloc_trim() is a gnu extension. An alternative would be
+ // to call madvise(MADV_DONTNEED) but this is more complicated.
+ if (trim) malloc_trim(0);
diff --git a/dev-libs/link-grammar/link-grammar-5.12.3.ebuild b/dev-libs/link-grammar/link-grammar-5.12.3.ebuild
index 8aa2ad28347d..ad2d6ce3d75f 100644
--- a/dev-libs/link-grammar/link-grammar-5.12.3.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.12.3.ebuild
@@ -31,6 +31,11 @@ BDEPEND="
sys-devel/autoconf-archive
virtual/pkgconfig"
+PATCHES=(
+ # upstreamed (https://github.com/opencog/link-grammar/pull/1471)
+ "${FILESDIR}"/${P}-Wimplicit-function-declaration.patch
+)
+
pkg_setup() {
if use aspell && use hunspell; then
ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-05-07 18:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-07 18:36 [gentoo-commits] repo/gentoo:master commit in: dev-libs/link-grammar/, dev-libs/link-grammar/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2022-11-13 17:12 David Seifert
2022-03-19 17:10 David Seifert
2021-04-19 9:48 David Seifert
2020-09-28 19:50 Michał Górny
2020-08-16 11:46 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox