[Git][java-team/jffi][master] 4 commits: d/rules: improve dh_clean target

Jérôme Charaoui (@lavamind) gitlab at salsa.debian.org
Sun Dec 4 05:52:23 GMT 2022



Jérôme Charaoui pushed to branch master at Debian Java Maintainers / jffi


Commits:
f6a2c757 by Jérôme Charaoui at 2022-12-03T22:21:31-05:00
d/rules: improve dh_clean target

- - - - -
8dad977b by Jérôme Charaoui at 2022-12-03T22:33:37-05:00
d/patches: new patch to fix tests on 32bit arm

- - - - -
d2913d5f by Jérôme Charaoui at 2022-12-04T00:50:21-05:00
d/patches: add support for mipsel architecture

- - - - -
c78675d8 by Jérôme Charaoui at 2022-12-04T00:50:22-05:00
Update changelog for 1.3.9+ds-4 release

- - - - -


5 changed files:

- debian/changelog
- + debian/patches/0011-Fix-tests-for-32-bit-ARM-armel-and-armhf.patch
- + debian/patches/0012-Add-support-for-mips.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+jffi (1.3.9+ds-4) unstable; urgency=medium
+
+  * Team upload.
+  * d/rules: improve dh_clean target
+  * d/patches: new patch to fix tests on 32bit arm
+  * d/patches: add support for mipsel architecture
+
+ -- Jérôme Charaoui <jerome at riseup.net>  Sun, 04 Dec 2022 00:45:16 -0500
+
 jffi (1.3.9+ds-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/0011-Fix-tests-for-32-bit-ARM-armel-and-armhf.patch
=====================================
@@ -0,0 +1,39 @@
+From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome at riseup.net>
+Date: Sat, 3 Dec 2022 21:02:30 -0500
+Subject: Fix tests for 32-bit ARM (armel and armhf)
+
+Forwarded: https://github.com/jnr/jffi/pull/131
+---
+ jni/jffi/FastNumericInvoker.c                | 4 ----
+ src/test/java/com/kenai/jffi/NumberTest.java | 2 ++
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/jni/jffi/FastNumericInvoker.c b/jni/jffi/FastNumericInvoker.c
+index 184eca1..a165c90 100644
+--- a/jni/jffi/FastNumericInvoker.c
++++ b/jni/jffi/FastNumericInvoker.c
+@@ -50,11 +50,7 @@
+ 
+ 
+ /* for return values <= sizeof(long), need to use an ffi_sarg sized return value */
+-#if BYTE_ORDER == BIG_ENDIAN
+ # define RETVAL(retval, ctx) ((ctx->cif.rtype)->size > sizeof(ffi_sarg) ? (retval).j : (retval).sarg)
+-#else
+-# define RETVAL(retval, ctx) ((retval).j)
+-#endif
+ 
+ #define MAX_STACK_ARRAY (1024)
+ 
+diff --git a/src/test/java/com/kenai/jffi/NumberTest.java b/src/test/java/com/kenai/jffi/NumberTest.java
+index b329bd7..d713bc0 100644
+--- a/src/test/java/com/kenai/jffi/NumberTest.java
++++ b/src/test/java/com/kenai/jffi/NumberTest.java
+@@ -264,6 +264,8 @@ public class NumberTest {
+         Assume.assumeFalse("Apple Silicon does not support 80-bit long double",
+                 Platform.getPlatform().getOS() == Platform.OS.DARWIN &&
+                 Platform.getPlatform().getCPU() == Platform.CPU.AARCH64);
++        Assume.assumeFalse("32-bit ARM does not support 80-bit long double",
++                Platform.getPlatform().getCPU() == Platform.CPU.ARM);
+         LibNumberTest lib = UnitHelper.loadTestLibrary(LibNumberTest.class, type);
+         BigDecimal param = new BigDecimal("1.234567890123456789");
+         BigDecimal result = lib.ret_f128(param);


=====================================
debian/patches/0012-Add-support-for-mips.patch
=====================================
@@ -0,0 +1,71 @@
+From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome at riseup.net>
+Date: Sat, 3 Dec 2022 22:43:24 -0500
+Subject: Add support for mips/mipsel architecture
+
+---
+ src/main/java/com/kenai/jffi/Platform.java            | 5 +++++
+ src/main/java/com/kenai/jffi/internal/StubLoader.java | 4 ++++
+ src/test/java/com/kenai/jffi/NumberTest.java          | 5 +++--
+ 3 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/main/java/com/kenai/jffi/Platform.java b/src/main/java/com/kenai/jffi/Platform.java
+index b2f6978..dbd924f 100644
+--- a/src/main/java/com/kenai/jffi/Platform.java
++++ b/src/main/java/com/kenai/jffi/Platform.java
+@@ -104,6 +104,8 @@ public abstract class Platform {
+         ARM(32),
+         /** AARCH64 */
+         AARCH64(64),
++       /** MIPS */
++        MIPS(32),
+        /** MIPS64EL */
+         MIPS64EL(64),
+         /** Unknown CPU */
+@@ -243,6 +245,9 @@ public abstract class Platform {
+             } else if (Util.equalsIgnoreCase("aarch64", archString, LOCALE)) {
+                 return CPU.AARCH64;
+ 
++            } else if (Util.equalsIgnoreCase("mips", archString, LOCALE) || Util.equalsIgnoreCase("mipsel", archString, LOCALE)) {
++                return CPU.MIPS;
++
+             } else if (Util.equalsIgnoreCase("mips64", archString, LOCALE) || Util.equalsIgnoreCase("mips64el", archString, LOCALE)) {
+                 return CPU.MIPS64EL;
+             }
+diff --git a/src/main/java/com/kenai/jffi/internal/StubLoader.java b/src/main/java/com/kenai/jffi/internal/StubLoader.java
+index 15f9c44..05d325b 100644
+--- a/src/main/java/com/kenai/jffi/internal/StubLoader.java
++++ b/src/main/java/com/kenai/jffi/internal/StubLoader.java
+@@ -159,6 +159,8 @@ public class StubLoader {
+         ARM,
+         /** AArch64 */
+         AARCH64,
++        /** MIPS 32-bit */
++        MIPS,
+         /** MIPS 64-bit little endian */
+         MIPS64EL,
+         /** Unknown CPU */
+@@ -227,6 +229,8 @@ public class StubLoader {
+             return CPU.ARM;
+         } else if (Util.equalsIgnoreCase("aarch64", archString, LOCALE)) {
+             return CPU.AARCH64;
++        } else if (Util.equalsIgnoreCase("mips", archString, LOCALE) || Util.equalsIgnoreCase("mipsel", archString, LOCALE)) {
++            return CPU.MIPS;
+         } else if (Util.equalsIgnoreCase("mips64", archString, LOCALE) || Util.equalsIgnoreCase("mips64el", archString, LOCALE)) {
+             return CPU.MIPS64EL;
+ 
+diff --git a/src/test/java/com/kenai/jffi/NumberTest.java b/src/test/java/com/kenai/jffi/NumberTest.java
+index d713bc0..f5ccc57 100644
+--- a/src/test/java/com/kenai/jffi/NumberTest.java
++++ b/src/test/java/com/kenai/jffi/NumberTest.java
+@@ -264,8 +264,9 @@ public class NumberTest {
+         Assume.assumeFalse("Apple Silicon does not support 80-bit long double",
+                 Platform.getPlatform().getOS() == Platform.OS.DARWIN &&
+                 Platform.getPlatform().getCPU() == Platform.CPU.AARCH64);
+-        Assume.assumeFalse("32-bit ARM does not support 80-bit long double",
+-                Platform.getPlatform().getCPU() == Platform.CPU.ARM);
++        Assume.assumeFalse("32-bit ARM and MIPS do not support 80-bit long double",
++                Platform.getPlatform().getCPU() == Platform.CPU.ARM ||
++                Platform.getPlatform().getCPU() == Platform.CPU.MIPS);
+         LibNumberTest lib = UnitHelper.loadTestLibrary(LibNumberTest.class, type);
+         BigDecimal param = new BigDecimal("1.234567890123456789");
+         BigDecimal result = lib.ret_f128(param);


=====================================
debian/patches/series
=====================================
@@ -8,3 +8,5 @@ nonlinux-platforms.patch
 0008-fix-native-library-artifact-not-linked-to-ffi.patch
 0009-optimize-build-targets.patch
 0010-output-test-results-to-console-instead-of-file.patch
+0011-Fix-tests-for-32-bit-ARM-armel-and-armhf.patch
+0012-Add-support-for-mips.patch


=====================================
debian/rules
=====================================
@@ -41,4 +41,6 @@ override_jh_manifest-indep:
 override_dh_clean:
 	ant clean
 	dh_clean
-	rm -f debian/jffi.versioned.bnd
+	@rm -f debian/jffi.versioned.bnd
+	@rm -f jni/*/libjffi*.so /tmp/jffi-*.so
+	@rm -rf archive



View it on GitLab: https://salsa.debian.org/java-team/jffi/-/compare/ff400bf1f5c032fd4babc52f4c190c178e901664...c78675d85a8d22feb8275b0fa15ad3e5993ac1e1

-- 
View it on GitLab: https://salsa.debian.org/java-team/jffi/-/compare/ff400bf1f5c032fd4babc52f4c190c178e901664...c78675d85a8d22feb8275b0fa15ad3e5993ac1e1
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/20221204/ff60eeb2/attachment.htm>


More information about the pkg-java-commits mailing list