[SCM] Packaging for libjna-java a library for dynamic access of native libraries from Java without JNI branch, master, updated. debian/3.2.7-4-15-g36d23d9
Andrew Ross
ubuntu at rossfamily.co.uk
Tue Jul 24 02:02:40 UTC 2012
The following commit has been merged in the master branch:
commit 36d23d918163ebec332b5692253a35a131744c0c
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Tue Jul 24 03:02:32 2012 +0100
Fix for multiarch patch
diff --git a/debian/patches/08-multiarch-support.patch b/debian/patches/08-multiarch-support.patch
index 333c690..1e11822 100644
--- a/debian/patches/08-multiarch-support.patch
+++ b/debian/patches/08-multiarch-support.patch
@@ -79,7 +79,7 @@ Support all Debian multi-arch directories in library lookups.
// Linux & FreeBSD use /usr/lib32, solaris uses /usr/lib/32
archPath = (Platform.isSolaris() ? "/" : "") + Pointer.SIZE * 8;
}
-@@ -660,23 +661,23 @@
+@@ -660,23 +661,27 @@
// paths is scanned against real directory
// so for platforms which are not multi-arch
// this should continue to work.
@@ -103,6 +103,10 @@ Support all Debian multi-arch directories in library lookups.
- String multiArchPath =
- cpu + "-" + kernel + "-" + libc;
++ if (Platform.iskFreeBSD()) {
++ kernel = "kfreebsd";
++ }
++
+ String multiArchPath;
+
+ if (Platform.isGNU()) {
--
Packaging for libjna-java a library for dynamic access of native libraries from Java without JNI
More information about the pkg-java-commits
mailing list