[Git][java-team/libjna-java][master] 2 commits: fix JNA Hello World on armhf

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / libjna-java


Commits:
c69675fa by Alexandre Rossi at 2023-01-28T16:39:48+01:00
fix JNA Hello World on armhf

- - - - -
d7066a3d by tony mancill at 2023-01-28T15:26:35-08:00
Prepare changelog for upload

- - - - -


2 changed files:

- debian/changelog
- debian/patches/04-load-native-code-from-fs.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+libjna-java (5.13.0-2) unstable; urgency=medium
+
+  [ tony mancill ]
+  * Team upload.
+
+  [ Alexandre Rossi ]
+  * Fix JNA Hello World on armhf (Closes: #1029908)
+
+ -- tony mancill <tmancill at debian.org>  Sat, 28 Jan 2023 15:25:15 -0800
+
 libjna-java (5.13.0-1) unstable; urgency=medium
 
   * Team upload


=====================================
debian/patches/04-load-native-code-from-fs.patch
=====================================
@@ -1,8 +1,8 @@
 Subject: try to load native library from /usr/lib/jni if system
  property jna.boot.library.path is not set
 Author: Jan Dittberner <jandd at debian.org>
---- libjna-java.orig/src/com/sun/jna/Native.java	2023-01-11 16:20:58.854725570 +0000
-+++ libjna-java/src/com/sun/jna/Native.java	2023-01-11 16:20:58.854725570 +0000
+--- libjna-java.orig/src/com/sun/jna/Native.java	2023-01-28 14:29:27.494569137 +0100
++++ libjna-java/src/com/sun/jna/Native.java	2023-01-28 14:29:27.486568833 +0100
 @@ -952,6 +952,9 @@
  
          String libName = System.getProperty("jna.boot.library.name", "jnidispatch");
@@ -13,9 +13,9 @@ Author: Jan Dittberner <jandd at debian.org>
          if (bootPath != null) {
              // String.split not available in 1.4
              StringTokenizer dirs = new StringTokenizer(bootPath, File.pathSeparator);
---- libjna-java.orig/src/com/sun/jna/NativeLibrary.java	2023-01-11 16:20:58.854725570 +0000
-+++ libjna-java/src/com/sun/jna/NativeLibrary.java	2023-01-11 16:20:58.854725570 +0000
-@@ -928,7 +928,7 @@
+--- libjna-java.orig/src/com/sun/jna/NativeLibrary.java	2023-01-28 14:29:27.494569137 +0100
++++ libjna-java/src/com/sun/jna/NativeLibrary.java	2023-01-28 14:29:27.486568833 +0100
+@@ -944,7 +944,7 @@
              // so for platforms which are not multi-arch
              // this should continue to work.
              if (Platform.isLinux() || Platform.iskFreeBSD() || Platform.isGNU()) {
@@ -24,7 +24,7 @@ Author: Jan Dittberner <jandd at debian.org>
  
                  // Assemble path with all possible options
                  paths = new String[] {
-@@ -974,30 +974,6 @@
+@@ -990,30 +990,6 @@
          librarySearchPath.addAll(initPaths("jna.platform.library.path"));
      }
  
@@ -55,9 +55,24 @@ Author: Jan Dittberner <jandd at debian.org>
      /**
       * Get the library paths from ldconfig cache. Tested against ldconfig 2.13.
       */
---- libjna-java.orig/src/com/sun/jna/Platform.java	2023-01-11 16:20:58.854725570 +0000
-+++ libjna-java/src/com/sun/jna/Platform.java	2023-01-11 16:21:36.499420520 +0000
-@@ -352,4 +352,30 @@
+--- libjna-java.orig/src/com/sun/jna/Platform.java	2023-01-28 14:29:27.494569137 +0100
++++ libjna-java/src/com/sun/jna/Platform.java	2023-01-28 15:50:48.853325082 +0100
+@@ -262,8 +262,12 @@
+             arch = "ppc64le";
+         }
+         // Map arm to armel if the binary is running as softfloat build
+-        if("arm".equals(arch) && platform == Platform.LINUX && isSoftFloat()) {
+-            arch = "armel";
++        if("arm".equals(arch) && platform == Platform.LINUX ) {
++            if(isSoftFloat()) {
++                arch = "armel";
++            } else if(!is64Bit()) {
++                arch = "armhf";
++            }
+         }
+ 
+         return arch;
+@@ -352,4 +356,30 @@
          }
          return osPrefix;
      }



View it on GitLab: https://salsa.debian.org/java-team/libjna-java/-/compare/6227362c4d279f040de87b21c630d29ad9fdd682...d7066a3d29379f6ed764eba4b74c02a2e3f2ac08

-- 
View it on GitLab: https://salsa.debian.org/java-team/libjna-java/-/compare/6227362c4d279f040de87b21c630d29ad9fdd682...d7066a3d29379f6ed764eba4b74c02a2e3f2ac08
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20230129/1afd8b0b/attachment.htm>