You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2026/10/13 18:01:45 UTC
(maven-mvnd) 01/01: Drop the 32-bit macOS native library
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch agent/drop-mac-x86-1x
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
commit edb9011f052c0da7b142e2dc6b8873413b17b824
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Tue Oct 13 17:59:51 2026 +0000
Drop the 32-bit macOS native library
mvnd runs its daemon on Java 17 or later, and no Java 17 build exists for 32-bit macOS; macOS 10.15 removed 32-bit applications in 2019. The Mac/x86 library could no longer be loaded.
---
native/Makefile | 6 +-----
native/Makefile.common | 9 +--------
.../mvndaemon/mvnd/nativ/Mac/x86/libmvndnative.jnilib | Bin 9044 -> 0 bytes
3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/native/Makefile b/native/Makefile
index 0d6169b2..0c695fc2 100644
--- a/native/Makefile
+++ b/native/Makefile
@@ -82,7 +82,7 @@ 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 mac-x86_64 mac-arm64 freebsd-x86 freebsd-x86_64
+ linux-arm64 linux-ppc64 win-x86 win-x86_64 mac-x86_64 mac-arm64 freebsd-x86 freebsd-x86_64
native: $(NATIVE_DLL)
@@ -136,10 +136,6 @@ target/dockcross/dockcross-windows-static-x64: dockcross
win-x86_64: download-includes target/dockcross/dockcross-windows-static-x64
target/dockcross/dockcross-windows-static-x64 --image dockcross/windows-static-x64$(windows-static-x64-digest) bash -c 'make clean-native native CROSS_PREFIX=x86_64-w64-mingw32.static- OS_NAME=Windows OS_ARCH=x86_64'
-mac-x86: download-includes
- docker run -it --rm -v $$PWD:/workdir --user $$(id -u):$$(id -g) \
- -e CROSS_TRIPLE=i386-apple-darwin multiarch/crossbuild$(cross-build-digest) make clean-native native OS_NAME=Mac OS_ARCH=x86
-
mac-x86_64: download-includes
docker run -it --rm -v $$PWD:/workdir --user $$(id -u):$$(id -g) \
-e CROSS_TRIPLE=x86_64-apple-darwin multiarch/crossbuild$(cross-build-digest) make clean-native native OS_NAME=Mac OS_ARCH=x86_64
diff --git a/native/Makefile.common b/native/Makefile.common
index f2457032..5da9c6ff 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 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_64 Mac-arm64 DragonFly-x86_64 FreeBSD-x86_64 OpenBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-sparcv9 HPUX-ia64_32
target := $(OS_NAME)-$(OS_ARCH)
ifeq (,$(findstring $(strip $(target)),$(known_targets)))
@@ -125,13 +125,6 @@ HPUX-ia64_32_LINKFLAGS := -b
HPUX-ia64_32_LIBNAME := libmvndnative.so
HPUX-ia64_32_JANSI_FLAGS :=
-Mac-x86_CC := gcc
-Mac-x86_STRIP := strip -x
-Mac-x86_CCFLAGS := -I$(JAVA_HOME)/include -Itarget/inc -Itarget/inc/unix -Os -fPIC -mmacosx-version-min=10.4 -fvisibility=hidden
-Mac-x86_LINKFLAGS := -dynamiclib
-Mac-x86_LIBNAME := libmvndnative.jnilib
-Mac-x86_JANSI_FLAGS := -DJANSI_ENABLE_LOCKING_STYLE=0
-
Mac-x86_64_CC := gcc -arch $(OS_ARCH)
Mac-x86_64_STRIP := strip -x
MAC_SDK := /Developer/SDKs/MacOSX10.10.sdk
diff --git a/native/src/main/resources/org/mvndaemon/mvnd/nativ/Mac/x86/libmvndnative.jnilib b/native/src/main/resources/org/mvndaemon/mvnd/nativ/Mac/x86/libmvndnative.jnilib
deleted file mode 100755
index 523e8ab4..00000000
Binary files a/native/src/main/resources/org/mvndaemon/mvnd/nativ/Mac/x86/libmvndnative.jnilib and /dev/null differ