[gentoo-commits] repo/gentoo:master commit in: dev-libs/xapian-bindings/, dev-libs/xapian-bindings/files/
commit: 6a4b73aff0b585dac26d161e8a0a5a906cf3c00f
Author: orbea riseup net>
AuthorDate: Fri Jul 22 01:53:45 2022 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Fri Jul 22 12:42:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a4b73af
dev-libs/xapian-bindings: Fix the build with slibtool
Bug: https://bugs.gentoo.org/793428
Upstream-PR: https://github.com/xapian/xapian/pull/322
Signed-off-by: orbea riseup.net>
Signed-off-by: Anthony G. Basile gentoo.org>
.../files/xapian-bindings-1.4.20-slibtool.patch| 133
.../xapian-bindings-1.4.20-r1.ebuild | 352 +
2 files changed, 485 insertions(+)
diff --git
a/dev-libs/xapian-bindings/files/xapian-bindings-1.4.20-slibtool.patch
b/dev-libs/xapian-bindings/files/xapian-bindings-1.4.20-slibtool.patch
new file mode 100644
index ..d73f8bcb19b9
--- /dev/null
+++ b/dev-libs/xapian-bindings/files/xapian-bindings-1.4.20-slibtool.patch
@@ -0,0 +1,133 @@
+Upstream-PR: https://github.com/xapian/xapian/pull/322
+
+From c513b0d31d2df31eb57ccbe08bbe46821863557d Mon Sep 17 00:00:00 2001
+From: orbea
+Date: Wed, 20 Jul 2022 13:37:20 -0700
+Subject: [PATCH] xapian-bindings: Fix the build with slibtool
+
+With slibtool the --config argument works differently than in GNU
+libtool which results in 'auto/Xapian/Xapian$(PERL_SO)' failing to be
+created. This can be worked around by using libtool --mode=install where
+slibtool can copy the module to the intended location.
+
+However GNU libtool still requires using --config otherwise it fails
+during --mode=install with the following error.
+
+ /bin/bash ../libtool --mode=install cp Xapian.la
/home/runner/work/xapian/xapian/perl/auto/Xapian/Xapian.la
+ libtool: error: error: cannot install 'Xapian.la' to a directory not
ending in /usr/local/lib/x86_64-linux-gnu/perl/5.26.1/auto/Xapian
+
+gentoo issue: https://bugs.gentoo.org/793428
+---
+ java/run-java-test | 21 +
+ perl/Makefile.am| 9 +++--
+ python3/Makefile.am | 9 +++--
+ tcl8/run-tcl-test | 20 +---
+ 4 files changed, 44 insertions(+), 15 deletions(-)
+
+diff --git a/java/run-java-test b/java/run-java-test
+index d0e97af300e..a838de98492 100755
+--- a/java/run-java-test
b/java/run-java-test
+@@ -1,11 +1,24 @@
+ #!/bin/sh
+ # To run `jdb` instead of `java` set JAVA=jdb
+ # To run under gdb, set JAVA='gdb --args java'
++LIBTOOL="${LIBTOOL-../libtool}"
+ arg=`echo "$1"|sed 's!.*/!!;s!\.class$!!'`
++
++# GNU libtool and slibtool have different and incompatible usage for --config.
++if ${LIBTOOL} --config > libtoolconfig.$$ 2>/dev/null; then
++ . ./libtoolconfig.$$
++else
++ objdir="built/libs"
++ rm -rf "$objdir"
++ mkdir -p "$objdir"
++ ${LIBTOOL} --mode=install cp libxapian_jni.la "$objdir"
++fi
++rm -f libtoolconfig.$$
++
+ # Use libtool's -dlopen option to ensure that libxapian_jni.so (or whatever)
+ # is in the shared library path.
+-${LIBTOOL-../libtool} --config > libtoolconfig.$$
+-. ./libtoolconfig.$$
+-rm -f libtoolconfig.$$
+-${LIBTOOL-../libtool} -dlopen libxapian_jni.la --mode=execute \
++${LIBTOOL} -dlopen libxapian_jni.la --mode=execute \
+ $OSX_SIP_HACK_ENV ${JAVA-java} -Djava.library.path="$objdir" -classpath
built/xapian.jar${PATHSEP-:}. "$arg"
++rc=$?
++rm -rf built/libs
++exit $rc
+diff --git a/perl/Makefile.am b/perl/Makefile.am
+index 4f2e5e4283d..f71579736e5 100644
+--- a/perl/Makefile.am
b/perl/Makefile.am
+@@ -55,9 +55,14 @@ BUILT_SOURCES = Xapian.pm xapian_wrap.cc \
+
+ auto/Xapian/Xapian$(PERL_SO): Xapian.la
+ @$(MKDIR_P) auto/Xapian
+- $(LIBTOOL) --config > libtoolconfig.tmp
++## GNU libtool and slibtool have different and incompatible usage for
--config.
++ if $(LIBTOOL) --config > libtoolconfig.tmp 2>/dev/null; then \
+ ## ksh requires a path on the sourced file.
+- . ./libtoolconfig.tmp; cp "$$objdir/Xapian$(PERL_SO)" auto/Xapian
++ . ./libtoolconfig.tmp; \
++ cp "$$objdir/Xapian$(PERL_SO)" auto/Xapian; \
++ else \
++ $(LIBTOOL) --mode=install cp $< $@; \
++ fi;
+ rm -f libtoolconfig.tmp
+
+ EXTRA_DIST = perl.i except.i extra.i $(TESTS) \
+diff --git a/python3/Makefile.am b/python3/Makefile.am
+index 3c692a9e2d4..9bf01833636 100644
+--- a/python3/Makefile.am
b/python3/Makefile.am
+@@ -88,9 +88,14 @@ xapian/__pycache__/__init__.@PYTHON3_CACHE_OPT1_EXT@:
xapian/__init__.py xapian/
+
+ xapian/_xapian$(PYTHON3_EXT_SUFFIX): _xapian.la
+ $(MKDIR_P) xapian
+- $(LIBTOOL) --config > libtoolconfig.tmp
++## GNU libtool and slibtool have different and incompatible usage for
--config.
++ if $(LIBTOOL) --config > libtoolconfig.tmp 2>/dev/null; then \
+ ## ksh requires a path on the sourced file.
+- . ./libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON3_EXT_SUFFIX) xapian
++ . ./libtoolconfig.tmp; \
++ cp
[gentoo-commits] repo/gentoo:master commit in: dev-libs/xapian-bindings/, dev-libs/xapian-bindings/files/
commit: c2e656e802ad71f770f478e1326112fe1f3cdc8d
Author: Anthony G. Basile gentoo org>
AuthorDate: Sat May 14 19:30:03 2016 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Sat May 14 19:30:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2e656e8
dev-libs/xapian-bindings: remove older 1.3 version
Package-Manager: portage-2.2.26
dev-libs/xapian-bindings/Manifest | 1 -
.../files/xapian-bindings-1.3.5-fix-perl-doc.patch | 14 ---
.../xapian-bindings/xapian-bindings-1.3.5.ebuild | 117 -
3 files changed, 132 deletions(-)
diff --git a/dev-libs/xapian-bindings/Manifest
b/dev-libs/xapian-bindings/Manifest
index 508983e..71ef15e 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,5 +1,4 @@
DIST xapian-bindings-1.2.19.tar.xz 828904 SHA256
3b9434c6144cc347783175c92829f304e86919bbbd44f51b7b4a7148960cde17 SHA512
ac72ec35ae3b767e04e848a9782b41d74e99b6b1f795d5096373911ff549b3bf2e602a91ed0e5f7dce2e43e1dd308af710719e5a80c6a179393aac4af316de30
WHIRLPOOL
33770203390fea6f6048ebdc63cb7031f53a30be3568e3f3f6f8a25f8aa30a284347b402e360c0c2182069e3f6dab067fc5f6cd2b950f45e196afe057e4d80e3
DIST xapian-bindings-1.2.22.tar.xz 844040 SHA256
b15ca7984980a1d2aedd3378648ef5f3889cb39a047bac1522a8e5d04f0a8557 SHA512
0eec204ebb92f1230b9dbd080ad2b56ea5fa8e6170eb4354556e5790c7a7da7ba4c8475aaf86fb8f10f102a461d91590184271220626315f55c0631e73e122e0
WHIRLPOOL
05ac5b31d73f9de0c101da832ef289f6a505baa68216eba6fa0cf80df1709feef7e42c7b8f4cf9af35f775e8514c6d4b944c2aceb10bc558a83305a637ce
DIST xapian-bindings-1.2.23.tar.xz 885888 SHA256
19b4b56c74863c51733d8c2567272ef7f004b898cf44016711ae25bc524b2215 SHA512
4be9d103a4073a08d2481e9ddc347156d4028a1517f313861ad3664e6103e052dc1a0d07a992da3ca02599505c002d09d77c4fd886c144918aab72977e69994c
WHIRLPOOL
1323e51dcd8f18f573f9338d9a013bfd370870c1fd2c0b0e3ff9d1f6b3b9154a0512d7442d7c7b1b00a70757faa218e8894a0f4fe56da88bca12ba2259cd35de
-DIST xapian-bindings-1.3.5.tar.xz 1005824 SHA256
4b5b9089d39b2a725651349127f64d24fe66db46572bdd92f39b8483bca400c3 SHA512
57c903a48c4e0875f5ada5b311afe74b0c0a2136d9827fd136638b4fb0f30ed51afaff57fb664ab264ac7eee4b3f61f4dc391f03bc17f63cc06de57eaaef5cc2
WHIRLPOOL
12e70382f584609de1bc00b3527f9b755ccdfa201203da9595c62fde622fd5b85f66c3f3bf314c7f2e1a9f313557fd11899dff5eced3823247b8fa2b6691890b
DIST xapian-bindings-1.3.6.tar.xz 1019216 SHA256
ba33436dee5165f61f2e289cfb18b1acdc4b2a811afdf68158845680e744eda0 SHA512
318324d9deb6a359de79eadb792c598661bde2ff9e1b241e29b18cdf1a2cf3dbeb9f5643c6bf8c7fbdbc8a2fd0baa91384398e694448312b6d8383960407f7fe
WHIRLPOOL
eb6844809572cad97d90be20ee27d28556342b27145e9e6c1efaea09f50a6001bad708a6370051edb9d065081a571c7552aaa36c601e1247a9aa5c5550549131
diff --git
a/dev-libs/xapian-bindings/files/xapian-bindings-1.3.5-fix-perl-doc.patch
b/dev-libs/xapian-bindings/files/xapian-bindings-1.3.5-fix-perl-doc.patch
deleted file mode 100644
index 2bd895b..000
--- a/dev-libs/xapian-bindings/files/xapian-bindings-1.3.5-fix-perl-doc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
perl/Makefile.am.orig 2016-04-14 19:05:30.879298356 -0400
-+++ perl/Makefile.am 2016-04-14 19:05:37.907298474 -0400
-@@ -168,10 +168,10 @@
- endif
- MAINTAINERCLEANFILES = $(BUILT_SOURCES)
-
-+if DOCUMENTATION_RULES
- docdatadir = $(docdir)/perl
- docdata_DATA = docs/index.html
-
--if DOCUMENTATION_RULES
- BUILT_SOURCES += docs/index.html
-
- docs/index.html: Xapian.pm
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.3.5.ebuild
b/dev-libs/xapian-bindings/xapian-bindings-1.3.5.ebuild
deleted file mode 100644
index 1e2c71d..000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.3.5.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE=threads
-DISTUTILS_SINGLE_IMPL=yesplz
-DISTUTILS_OPTIONAL=yesplz
-DISTUTILS_IN_SOURCE_BUILD=yesplz
-
-USE_PHP="php5-5 php5-6"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-#mono violates sandbox, we disable it until we figure this out
-#inherit autotools distutils-r1 libtool java-pkg-opt-2 mono-env
php-ext-source-r2 toolchain-funcs
-inherit autotools distutils-r1 libtool java-pkg-opt-2 php-ext-source-r2
toolchain-funcs
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="http://www.xapian.org/;
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-#IUSE="java lua mono perl php python ruby tcl"
-IUSE="java lua perl php python ruby tcl"
-#REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
-REQUIRED_USE="|| ( java lua perl php python ruby tcl )"
-
-COMMONDEPEND="dev-libs/xapian:0/1.3.6
- lua? ( dev-lang/lua:= )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
[gentoo-commits] repo/gentoo:master commit in: dev-libs/xapian-bindings/, dev-libs/xapian-bindings/files/
commit: ac43fa57c846d3b491f7924cbf8569b6c22603ec
Author: Anthony G. Basile gentoo org>
AuthorDate: Thu Apr 14 23:30:04 2016 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Thu Apr 14 23:30:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac43fa57
dev-libs/xapian-bindings: fix bug #579412
Package-Manager: portage-2.2.26
.../files/xapian-bindings-1.3.5-fix-perl-doc.patch | 14 ++
dev-libs/xapian-bindings/xapian-bindings-1.3.5.ebuild | 10 --
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git
a/dev-libs/xapian-bindings/files/xapian-bindings-1.3.5-fix-perl-doc.patch
b/dev-libs/xapian-bindings/files/xapian-bindings-1.3.5-fix-perl-doc.patch
new file mode 100644
index 000..2bd895b
--- /dev/null
+++ b/dev-libs/xapian-bindings/files/xapian-bindings-1.3.5-fix-perl-doc.patch
@@ -0,0 +1,14 @@
+--- perl/Makefile.am.orig 2016-04-14 19:05:30.879298356 -0400
perl/Makefile.am 2016-04-14 19:05:37.907298474 -0400
+@@ -168,10 +168,10 @@
+ endif
+ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+
++if DOCUMENTATION_RULES
+ docdatadir = $(docdir)/perl
+ docdata_DATA = docs/index.html
+
+-if DOCUMENTATION_RULES
+ BUILT_SOURCES += docs/index.html
+
+ docs/index.html: Xapian.pm
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.3.5.ebuild
b/dev-libs/xapian-bindings/xapian-bindings-1.3.5.ebuild
index b23f568..1e2c71d 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.3.5.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.3.5.ebuild
@@ -56,14 +56,11 @@ pkg_setup() {
src_prepare() {
use java && java-pkg-opt-2_src_prepare
- if use python; then
- sed \
- -e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1
xapian/_xapian$(PYTHON_SO)|' \
- -i python/Makefile.in || die "sed failed"
- fi
-
# http://trac.xapian.org/ticket/702
export XAPIAN_CONFIG="/usr/bin/xapian-config"
+
+ # Fix bug #579412 - requires re-automaking
+ epatch "${FILESDIR}"/${P}-fix-perl-doc.patch
eautoreconf
}
@@ -82,6 +79,7 @@ src_configure() {
fi
econf \
+ --disable-documentation \
$(use_with java) \
$(use_with lua) \
--without-csharp \
