summaryrefslogtreecommitdiff
path: root/dev-libs/xapian-bindings/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-04-02 17:18:27 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-04-02 17:18:27 +0100
commit97310164515a0a048d4f049ae2d3e8d413fb94c6 (patch)
treefe6e0f7a81db145205e303d191864b537743bd74 /dev-libs/xapian-bindings/files
parentf253e820eb4e6794ad484f5bc27182d236aeb41e (diff)
gentoo auto-resync : 02:04:2023 - 17:18:27
Diffstat (limited to 'dev-libs/xapian-bindings/files')
-rw-r--r--dev-libs/xapian-bindings/files/xapian-bindings-1.4.22-fix-java-installation.patch15
-rw-r--r--dev-libs/xapian-bindings/files/xapian-bindings-1.4.22-remove-precompiled-python.patch22
2 files changed, 37 insertions, 0 deletions
diff --git a/dev-libs/xapian-bindings/files/xapian-bindings-1.4.22-fix-java-installation.patch b/dev-libs/xapian-bindings/files/xapian-bindings-1.4.22-fix-java-installation.patch
new file mode 100644
index 000000000000..58cc6da9a68c
--- /dev/null
+++ b/dev-libs/xapian-bindings/files/xapian-bindings-1.4.22-fix-java-installation.patch
@@ -0,0 +1,15 @@
+The build system installs stray pyc files.
+
+--- a/python3/Makefile.am
++++ b/python3/Makefile.am
+@@ -40,9 +40,7 @@
+
+ # Install as _DATA rather than _SCRIPTS because we don't want to make these
+ # executable (they don't have a #! line).
+-pkgpylib_DATA = xapian/__init__.py \
+- xapian/__pycache__/__init__.@PYTHON3_CACHE_TAG@.pyc \
+- xapian/__pycache__/__init__.@PYTHON3_CACHE_OPT1_EXT@
++pkgpylib_DATA = xapian/__init__.py
+
+ pkgpylib_LTLIBRARIES = _xapian.la
+
diff --git a/dev-libs/xapian-bindings/files/xapian-bindings-1.4.22-remove-precompiled-python.patch b/dev-libs/xapian-bindings/files/xapian-bindings-1.4.22-remove-precompiled-python.patch
new file mode 100644
index 000000000000..c8155ee2c36e
--- /dev/null
+++ b/dev-libs/xapian-bindings/files/xapian-bindings-1.4.22-remove-precompiled-python.patch
@@ -0,0 +1,22 @@
+The build system installs the jni shared library in a wrong path.
+
+--- a/java/Makefile.am
++++ b/java/Makefile.am
+@@ -137,7 +137,7 @@
+
+ jnidir = `pwd`/built
+
+-jni_LTLIBRARIES = libxapian_jni.la
++noinst_LTLIBRARIES = libxapian_jni.la
+
+ # Remove the .la file - libxapian_jni.la is never linked against (it's a
+ # module) and JVMs don't use libltdl. Note that the library gets installed by
+@@ -162,7 +162,7 @@
+ endif
+ AM_CXXFLAGS = $(SWIG_CXXFLAGS) $(XAPIAN_CXXFLAGS)
+ AM_CPPFLAGS = $(JAVA_CPPFLAGS)
+-libxapian_jni_la_LDFLAGS = -avoid-version -module $(SHREXT) $(NO_UNDEFINED)
++libxapian_jni_la_LDFLAGS = -avoid-version -module $(SHREXT) $(NO_UNDEFINED) -rpath $(libdir)/xapian-bindings
+ libxapian_jni_la_LIBADD = $(XAPIAN_LIBS)
+ libxapian_jni_la_SOURCES = xapian_wrap.cc
+