This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git


The following commit(s) were added to refs/heads/master by this push:
     new 4ef104a5 Drop the 32-bit mvndnative libraries on master
4ef104a5 is described below

commit 4ef104a5f48784bbb41d8f910f8acdfad49af681
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Fri Nov 6 22:37:19 2026 +0100

    Drop the 32-bit mvndnative libraries on master
    
    Fixes #1823
---
 README.adoc                                        |   8 +++---
 native/Makefile                                    |  26 ++----------------
 native/Makefile.common                             |  30 +--------------------
 .../mvnd/nativ/FreeBSD/x86/libmvndnative.so        | Bin 4803 -> 0 bytes
 .../mvnd/nativ/Linux/arm/libmvndnative.so          | Bin 7804 -> 0 bytes
 .../mvnd/nativ/Linux/x86/libmvndnative.so          | Bin 14800 -> 0 bytes
 .../mvnd/nativ/Windows/x86/mvndnative.dll          | Bin 87265 -> 0 bytes
 7 files changed, 7 insertions(+), 57 deletions(-)

diff --git a/README.adoc b/README.adoc
index 5379eac0..d33eb9f8 100644
--- a/README.adoc
+++ b/README.adoc
@@ -165,15 +165,15 @@ The last column lists the Java 17 or later builds that 
vendors published as of O
 |Linux aarch64 |yes |yes |Temurin, Liberica, Zulu, Microsoft: 17, 21, 25
 |Linux ppc64le |no |yes |Temurin, Liberica: 17, 21, 25
 |Linux armv6, armv7 (hard-float) |no |yes |Liberica: 17, 21, 25; Temurin, 
Zulu: 17
-|Linux arm (`softfp`) |no |yes |none found
-|Linux x86 (32-bit) |no |yes |Liberica: 17, 21; Zulu: 17
+|Linux arm (`softfp`) |no |no |none found
+|Linux x86 (32-bit) |no |no |Liberica: 17, 21; Zulu: 17
 |macOS aarch64 |yes |yes |Temurin, Liberica, Zulu, Microsoft: 17, 21, 25
 |macOS x86_64 |no |yes |Temurin, Liberica, Zulu, Microsoft: 17, 21, 25
 |Windows x86_64 |yes |yes |Temurin, Liberica, Zulu, Microsoft: 17, 21, 25
-|Windows x86 (32-bit) |no |yes |Temurin, Zulu: 17
+|Windows x86 (32-bit) |no |no |Temurin, Zulu: 17
 |Windows aarch64 |no |no |Microsoft, Zulu: 17, 21, 25; Temurin: 21
 |FreeBSD x86_64 |no |yes |FreeBSD ports: 17, 21, 25
-|FreeBSD x86 (32-bit) |no |yes |FreeBSD ports: 17, 21
+|FreeBSD x86 (32-bit) |no |no |FreeBSD ports: 17, 21
 |===
 
 On Linux, the native client links to the system C library dynamically and 
needs glibc 2.12 or later on x86_64,
diff --git a/native/Makefile b/native/Makefile
index 0c695fc2..6551576a 100644
--- a/native/Makefile
+++ b/native/Makefile
@@ -20,8 +20,6 @@ include Makefile.common
 .PHONY: all package native native-all deploy crossbuild ducible clean-native
 
 
linux-armv6-digest:=@sha256:a90a7deda7f561932d9ad658f8d661d17eeb44f4e7f7024ac087db1d0b95c6f5
-linux-x86-digest:=@sha256:fbe45fcb0c2ce82f84a998a1d37d67b3906502723ed89f8191c3243d9d835d17
-windows-static-x86-digest:=@sha256:b205eeeafaef4f44482d16254670da815d5679b03cf8e51e4adc3539d1c4a9c0
 
windows-static-x64-digest:=@sha256:d385eec5b60e0892b3171c5cba3b892afccb3a45aed1ee9dc41b8a13c50e8aa5
 
cross-build-digest:=@sha256:8dbaa86462270db93ae1b1b319bdd88d89272faf3a68632daf4fa36b414a326e
 
freebsd-crossbuild-digest:=@sha256:cda62697a15d8bdc0bc26e780b1771ee78f12c55e7d5813e62c478af5a747c43
@@ -81,8 +79,8 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
 
 # For cross-compilation, install docker. See also 
https://github.com/dockcross/dockcross
 # Disabled linux-armv6 build because of this issue; 
https://github.com/dockcross/dockcross/issues/190
-native-all: linux-x86 linux-x86_64 linux-arm linux-armv6 linux-armv7 \
-       linux-arm64 linux-ppc64 win-x86 win-x86_64 mac-x86_64 mac-arm64 
freebsd-x86 freebsd-x86_64
+native-all: linux-x86_64 linux-armv6 linux-armv7 \
+       linux-arm64 linux-ppc64 win-x86_64 mac-x86_64 mac-arm64 freebsd-x86_64
 
 native: $(NATIVE_DLL)
 
@@ -92,20 +90,10 @@ $(NATIVE_DLL): $(MVNDNATIVE_OUT)/$(LIBNAME)
        @mkdir -p $(NATIVE_TARGET_DIR)
        cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME)
 
-target/dockcross/dockcross-linux-x86: dockcross
-       docker run --rm dockcross/linux-x86$(linux-x86-digest) > 
target/dockcross/dockcross-linux-x86
-       chmod +x target/dockcross/dockcross-linux-x86
-linux-x86: download-includes target/dockcross/dockcross-linux-x86
-       target/dockcross/dockcross-linux-x86 --image 
dockcross/linux-x86$(linux-x86-digest) bash -c 'make clean-native native 
OS_NAME=Linux OS_ARCH=x86'
-
 linux-x86_64: download-includes
        docker run -it --rm -v $$PWD:/workdir --user $$(id -u):$$(id -g) \
                -e CROSS_TRIPLE=x86_64-linux-gnu 
multiarch/crossbuild$(cross-build-digest) make clean-native native 
OS_NAME=Linux OS_ARCH=x86_64
 
-linux-arm: download-includes
-       docker run -it --rm -v $$PWD:/workdir --user $$(id -u):$$(id -g) \
-               -e CROSS_TRIPLE=arm-linux-gnueabi 
multiarch/crossbuild$(cross-build-digest) make clean-native native 
OS_NAME=Linux OS_ARCH=arm
-
 target/dockcross/dockcross-linux-armv6: dockcross
        docker run --rm dockcross/linux-armv6$(linux-armv6-digest) > 
target/dockcross/dockcross-linux-armv6
        chmod +x target/dockcross/dockcross-linux-armv6
@@ -124,12 +112,6 @@ linux-ppc64: download-includes
        docker run -it --rm -v $$PWD:/workdir --user $$(id -u):$$(id -g) \
                -e CROSS_TRIPLE=powerpc64le-linux-gnu 
multiarch/crossbuild$(cross-build-digest) make clean-native native 
OS_NAME=Linux OS_ARCH=ppc64
 
-target/dockcross/dockcross-windows-static-x86: dockcross
-       docker run --rm 
dockcross/windows-static-x86$(windows-static-x86-digest) > 
target/dockcross/dockcross-windows-static-x86
-       chmod +x target/dockcross/dockcross-windows-static-x86
-win-x86: download-includes target/dockcross/dockcross-windows-static-x86
-       target/dockcross/dockcross-windows-static-x86 --image 
dockcross/windows-static-x86$(windows-static-x86-digest) bash -c 'make 
clean-native native CROSS_PREFIX=i686-w64-mingw32.static- OS_NAME=Windows 
OS_ARCH=x86'
-
 target/dockcross/dockcross-windows-static-x64: dockcross
        docker run --rm 
dockcross/windows-static-x64$(windows-static-x64-digest) > 
target/dockcross/dockcross-windows-static-x64
        chmod +x target/dockcross/dockcross-windows-static-x64
@@ -144,10 +126,6 @@ mac-arm64: download-includes
        docker run -it --rm -v $$PWD:/src --user $$(id -u):$$(id -g) \
                -e TARGET=arm64-apple-darwin mcandre/snek$(mcandre-snek-digest) 
sh -c "make clean-native native CROSS_PREFIX=arm64-apple-darwin20.4- 
OS_NAME=Mac OS_ARCH=arm64"
 
-freebsd-x86: download-includes
-       docker run -it --rm -v $$PWD:/workdir --user $$(id -u):$$(id -g) \
-               empterdose/freebsd-cross-build$(freebsd-crossbuild-digest) make 
clean-native native CROSS_PREFIX=i386-freebsd9- OS_NAME=FreeBSD OS_ARCH=x86
-
 freebsd-x86_64: download-includes
        docker run -it --rm -v $$PWD:/workdir --user $$(id -u):$$(id -g) \
                empterdose/freebsd-cross-build$(freebsd-crossbuild-digest) make 
clean-native native CROSS_PREFIX=x86_64-freebsd9- OS_NAME=FreeBSD OS_ARCH=x86_64
diff --git a/native/Makefile.common b/native/Makefile.common
index 5da9c6ff..ca7cc185 100644
--- a/native/Makefile.common
+++ b/native/Makefile.common
@@ -17,7 +17,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_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_64 Linux-armv6 Linux-armv7 Linux-android-arm 
Linux-ppc64 Mac-x86_64 Mac-arm64 DragonFly-x86_64 FreeBSD-x86_64 OpenBSD-x86_64 
Windows-x86_64 SunOS-sparcv9 HPUX-ia64_32
 target := $(OS_NAME)-$(OS_ARCH)
 
 ifeq (,$(findstring $(strip $(target)),$(known_targets)))
@@ -34,13 +34,6 @@ Default_LINKFLAGS := -shared
 Default_LIBNAME   := libmvndnative.so
 Default_JANSI_FLAGS  := 
 
-Linux-x86_CC        := $(CROSS_PREFIX)gcc
-Linux-x86_STRIP     := $(CROSS_PREFIX)strip
-Linux-x86_CCFLAGS   := -I$(JAVA_HOME)/include -Itarget/inc -Itarget/inc/unix 
-Os -fPIC -m32 -fvisibility=hidden
-Linux-x86_LINKFLAGS := -shared -static-libgcc
-Linux-x86_LIBNAME   := libmvndnative.so
-Linux-x86_JANSI_FLAGS  := 
-
 Linux-x86_64_CC        := $(CROSS_PREFIX)gcc
 Linux-x86_64_STRIP     := $(CROSS_PREFIX)strip
 Linux-x86_64_CCFLAGS   := -I$(JAVA_HOME)/include -Itarget/inc 
-Itarget/inc/unix -Os -fPIC -m64 -fvisibility=hidden
@@ -48,13 +41,6 @@ Linux-x86_64_LINKFLAGS := -shared -static-libgcc
 Linux-x86_64_LIBNAME   := libmvndnative.so
 Linux-x86_64_JANSI_FLAGS  := 
 
-Linux-arm_CC          := $(CROSS_PREFIX)gcc
-Linux-arm_STRIP       := $(CROSS_PREFIX)strip
-Linux-arm_CCFLAGS     := -I$(JAVA_HOME)/include -Itarget/inc -Itarget/inc/unix 
-Os -fPIC -mfloat-abi=softfp -mfpu=vfp -fvisibility=hidden
-Linux-arm_LINKFLAGS   := -shared -static-libgcc
-Linux-arm_LIBNAME     := libmvndnative.so
-Linux-arm_JANSI_FLAGS  :=
-
 Linux-armv6_CC        := $(CROSS_PREFIX)gcc
 Linux-armv6_STRIP     := $(CROSS_PREFIX)strip
 Linux-armv6_CCFLAGS   := -I$(JAVA_HOME)/include -Itarget/inc -Itarget/inc/unix 
-Os -mfloat-abi=hard -mfpu=vfp -fPIC -fvisibility=hidden
@@ -90,13 +76,6 @@ DragonFly-x86_64_LINKFLAGS := -shared
 DragonFly-x86_64_LIBNAME   := libmvndnative.so
 DragonFly-x86_64_JANSI_FLAGS  :=
 
-FreeBSD-x86_CC        := $(CROSS_PREFIX)gcc
-FreeBSD-x86_STRIP     := $(CROSS_PREFIX)strip
-FreeBSD-x86_CCFLAGS   := -I$(JAVA_HOME)/include -Itarget/inc -Itarget/inc/unix 
-Os -fPIC -fvisibility=hidden
-FreeBSD-x86_LINKFLAGS := -shared
-FreeBSD-x86_LIBNAME   := libmvndnative.so
-FreeBSD-x86_JANSI_FLAGS  :=
-
 FreeBSD-x86_64_CC        := $(CROSS_PREFIX)gcc
 FreeBSD-x86_64_STRIP     := $(CROSS_PREFIX)strip
 FreeBSD-x86_64_CCFLAGS   := -I$(JAVA_HOME)/include -Itarget/inc 
-Itarget/inc/unix -Os -fPIC -fvisibility=hidden
@@ -144,13 +123,6 @@ Mac-arm64_LINKFLAGS := -shared
 Mac-arm64_LIBNAME   := libmvndnative.jnilib
 Mac-arm64_JANSI_FLAGS  :=
 
-Windows-x86_CC           := $(CROSS_PREFIX)gcc
-Windows-x86_STRIP        := $(CROSS_PREFIX)strip
-Windows-x86_CCFLAGS      := -D_JNI_IMPLEMENTATION_ -Itarget/inc 
-Itarget/inc/windows -Os
-Windows-x86_LINKFLAGS    := -Wl,--kill-at -shared -static-libgcc
-Windows-x86_LIBNAME      := mvndnative.dll
-Windows-x86_JANSI_FLAGS := 
-
 Windows-x86_64_CC           := $(CROSS_PREFIX)gcc
 Windows-x86_64_STRIP        := $(CROSS_PREFIX)strip
 Windows-x86_64_CCFLAGS      := -D_JNI_IMPLEMENTATION_ -Itarget/inc 
-Itarget/inc/windows -Os
diff --git 
a/native/src/main/resources/org/mvndaemon/mvnd/nativ/FreeBSD/x86/libmvndnative.so
 
b/native/src/main/resources/org/mvndaemon/mvnd/nativ/FreeBSD/x86/libmvndnative.so
deleted file mode 100755
index 741c2f87..00000000
Binary files 
a/native/src/main/resources/org/mvndaemon/mvnd/nativ/FreeBSD/x86/libmvndnative.so
 and /dev/null differ
diff --git 
a/native/src/main/resources/org/mvndaemon/mvnd/nativ/Linux/arm/libmvndnative.so 
b/native/src/main/resources/org/mvndaemon/mvnd/nativ/Linux/arm/libmvndnative.so
deleted file mode 100755
index f10df4f4..00000000
Binary files 
a/native/src/main/resources/org/mvndaemon/mvnd/nativ/Linux/arm/libmvndnative.so 
and /dev/null differ
diff --git 
a/native/src/main/resources/org/mvndaemon/mvnd/nativ/Linux/x86/libmvndnative.so 
b/native/src/main/resources/org/mvndaemon/mvnd/nativ/Linux/x86/libmvndnative.so
deleted file mode 100755
index f059d176..00000000
Binary files 
a/native/src/main/resources/org/mvndaemon/mvnd/nativ/Linux/x86/libmvndnative.so 
and /dev/null differ
diff --git 
a/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86/mvndnative.dll 
b/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86/mvndnative.dll
deleted file mode 100755
index 6a6de7fa..00000000
Binary files 
a/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86/mvndnative.dll 
and /dev/null differ

Reply via email to