Fix windows-arm64 DLL name (#292)

* Fix windows-arm64 DLL name * Upgrade cross compilation docker images * Rebuild libraries
fusesource · Sep 25, 2024 · 012fdaa · 012fdaa
1 parent 045fd56
commit 012fdaa
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -15,14 +15,14 @@ include Makefile.common
 
 .PHONY: all package native native-all deploy crossbuild ducible clean-native
 
-linux-armv6-digest:=@sha256:7bad6ab302af34bdf6634c8c2b02c8dc6ac932c67da9ecc199c549ab405e971e
-linux-x86-digest:=@sha256:7a8fda5ff1bb436ac1f2e7d40043deb630800fce33d123d04779d48f85702dcd
-windows-static-x86-digest:=@sha256:896bd4a43bbc89502904afdc8d00e6f2422f8f35852cc59777d6426bfc8491e8
+linux-armv6-digest:=@sha256:a90a7deda7f561932d9ad658f8d661d17eeb44f4e7f7024ac087db1d0b95c6f5
+linux-x86-digest:=@sha256:fbe45fcb0c2ce82f84a998a1d37d67b3906502723ed89f8191c3243d9d835d17
+windows-static-x86-digest:=@sha256:b205eeeafaef4f44482d16254670da815d5679b03cf8e51e4adc3539d1c4a9c0
 windows-static-x64-digest:=@sha256:f159861bc80b29e5dafb223477167bec53ecec6cdacb051d31e90c5823542100
-windows-arm64-digest:=@sha256:f4b3c1a49ec8b53418cef1499dc3f9a54a5570b7a3ecdf42fc8c83eb94b01b7d
+windows-arm64-digest:=@sha256:5a8e872064c5f600386e4124f9425d3e2ce2e168cadb6626655b2d69ed748849
 cross-build-digest:=@sha256:8dbaa86462270db93ae1b1b319bdd88d89272faf3a68632daf4fa36b414a326e
 freebsd-crossbuild-digest:=@sha256:cda62697a15d8bdc0bc26e780b1771ee78f12c55e7d5813e62c478af5a747c43
-mcandre-snek-digest:=@sha256:9f84e9fcdf66daafc1f1c3fb772a6c97977714e17800aeac2e3bbe5dc5039dd0
+mcandre-snek-digest:=@sha256:e5aaf20daece19796dcd0553feb971143b71cc67d13d79d73649cc689fb87287
 
 all: package
 

diff --git a/Makefile.common b/Makefile.common
@@ -14,7 +14,7 @@
 
 # os=Default is meant to be generic unix/linux
 
-known_targets := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-ppc64 Mac-x86 Mac-x86_64 Mac-arm64 DragonFly-x86_64 FreeBSD-x86_64 OpenBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-sparcv9 HPUX-ia64_32
+known_targets := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-ppc64 Mac-x86 Mac-x86_64 Mac-arm64 DragonFly-x86_64 FreeBSD-x86_64 OpenBSD-x86_64 Windows-x86 Windows-x86_64 Windows-arm64 SunOS-sparcv9 HPUX-ia64_32
 target := $(OS_NAME)-$(OS_ARCH)
 
 ifeq (,$(findstring $(strip $(target)),$(known_targets)))
@@ -162,6 +162,11 @@ Windows-x86_64_LINKFLAGS    := -Wl,--kill-at -shared -static-libgcc
 Windows-x86_64_LIBNAME      := jansi.dll
 Windows-x86_64_JANSI_FLAGS := 
 
+Windows-arm64_CC           := $(CROSS_PREFIX)gcc
+Windows-arm64_STRIP        := $(CROSS_PREFIX)strip
+Windows-arm64_CCFLAGS      := -D_JNI_IMPLEMENTATION_ -Itarget/inc -Itarget/inc/windows -Os
+Windows-arm64_LINKFLAGS    := -Wl,--kill-at -shared -static-libgcc
+Windows-arm64_LIBNAME      := jansi.dll
 
 CC        := $($(target)_CC)
 STRIP     := $($(target)_STRIP)

diff --git a/src/main/resources/org/fusesource/jansi/internal/native/Linux/arm/libjansi.so b/src/main/resources/org/fusesource/jansi/internal/native/Linux/arm/libjansi.so
diff --git a/src/main/resources/org/fusesource/jansi/internal/native/Linux/armv7/libjansi.so b/src/main/resources/org/fusesource/jansi/internal/native/Linux/armv7/libjansi.so
diff --git a/src/main/resources/org/fusesource/jansi/internal/native/Linux/ppc64/libjansi.so b/src/main/resources/org/fusesource/jansi/internal/native/Linux/ppc64/libjansi.so
diff --git a/src/main/resources/org/fusesource/jansi/internal/native/Linux/x86/libjansi.so b/src/main/resources/org/fusesource/jansi/internal/native/Linux/x86/libjansi.so
diff --git a/src/main/resources/org/fusesource/jansi/internal/native/Linux/x86_64/libjansi.so b/src/main/resources/org/fusesource/jansi/internal/native/Linux/x86_64/libjansi.so
diff --git a/src/main/resources/org/fusesource/jansi/internal/native/Mac/arm64/libjansi.jnilib b/src/main/resources/org/fusesource/jansi/internal/native/Mac/arm64/libjansi.jnilib
diff --git a/...internal/native/Windows/arm64/libjansi.so → ...i/internal/native/Windows/arm64/jansi.dll b/...internal/native/Windows/arm64/libjansi.so → ...i/internal/native/Windows/arm64/jansi.dll