mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
1.8.0: fixed loading of native library + enabled tests
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
32
dev-java/lz4-java/files/lz4-java-1.8.0-fix-load.patch
Normal file
32
dev-java/lz4-java/files/lz4-java-1.8.0-fix-load.patch
Normal file
@@ -0,0 +1,32 @@
|
||||
--- a/src/java/net/jpountz/util/Native.java
|
||||
+++ b/src/java/net/jpountz/util/Native.java
|
||||
@@ -100,17 +100,18 @@ public enum Native {
|
||||
return;
|
||||
}
|
||||
|
||||
- cleanupOldTempLibs();
|
||||
+// cleanupOldTempLibs();
|
||||
|
||||
// Try to load lz4-java (liblz4-java.so on Linux) from the java.library.path.
|
||||
+ final File library = new File(System.mapLibraryName("lz4-java"));
|
||||
try {
|
||||
- System.loadLibrary("lz4-java");
|
||||
+ System.load(library.getAbsolutePath());
|
||||
loaded = true;
|
||||
return;
|
||||
} catch (UnsatisfiedLinkError ex) {
|
||||
// Doesn't exist, so proceed to loading bundled library.
|
||||
}
|
||||
-
|
||||
+/*
|
||||
String resourceName = resourceName();
|
||||
InputStream is = Native.class.getResourceAsStream(resourceName);
|
||||
if (is == null) {
|
||||
@@ -158,6 +159,6 @@ public enum Native {
|
||||
tempLib.deleteOnExit();
|
||||
tempLibLock.deleteOnExit();
|
||||
}
|
||||
- }
|
||||
+ }*/
|
||||
}
|
||||
}
|
||||
@@ -17,9 +17,6 @@ S="${WORKDIR}/${P}"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
|
||||
# tests want sofile built into jar.
|
||||
# cannot find /net/jpountz/util/linux/amd64/liblz4-java.so
|
||||
RESTRICT="test"
|
||||
|
||||
DEPEND="
|
||||
app-arch/lz4:=
|
||||
@@ -31,6 +28,8 @@ RDEPEND="
|
||||
app-arch/lz4:=
|
||||
>=virtual/jre-1.8:*"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${P}-fix-load.patch" )
|
||||
|
||||
DOCS=( CHANGES.md README.md )
|
||||
|
||||
JAVA_AUTOMATIC_MODULE_NAME="org.lz4.java"
|
||||
@@ -39,6 +38,10 @@ JAVA_TEST_GENTOO_CLASSPATH="junit-4 randomized-runner"
|
||||
JAVA_TEST_RESOURCE_DIRS="src/test-resources"
|
||||
JAVA_TEST_SRC_DIR="src/test"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# remove precompiled native libraries
|
||||
rm -r src/resources || die
|
||||
Reference in New Issue
Block a user