From 7d5815f56c206ac5efb9550586d14499be3f6bdb Mon Sep 17 00:00:00 2001 From: JinhangZhang Date: Wed, 4 Dec 2024 12:27:08 -0500 Subject: [PATCH] Bundle OpenJCEPlus on Mac/Linux OpenJCEPlus providers are supported on the Mac OS with aarch64 and amd64 architectures. Also on the Linux aarch64. This PR aims to add aarch64-mac, x86_64-mac and Linux aarch64 to platforms bundling OpenJCEPlus. Signed-off-by: Jinhang Zhang --- closed/make/modules/openjceplus/Copy.gmk | 2 +- closed/make/modules/openjceplus/Lib.gmk | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/closed/make/modules/openjceplus/Copy.gmk b/closed/make/modules/openjceplus/Copy.gmk index 2a205f19472..ad5d95476e8 100644 --- a/closed/make/modules/openjceplus/Copy.gmk +++ b/closed/make/modules/openjceplus/Copy.gmk @@ -33,7 +33,7 @@ ifeq (true,$(BUILD_OPENJCEPLUS)) # Copy OpenJCEPlus native libraries. $(eval $(call SetupCopyFiles, OPENJCEPLUS_JGSKIT_LIBS_COPY, \ SRC := $(OPENJCEPLUS_TOPDIR)/target, \ - FILES := $(filter %.dll %.so %.x, $(call FindFiles, $(OPENJCEPLUS_TOPDIR)/target)), \ + FILES := $(filter %.dll %.dylib %.so %.x, $(call FindFiles, $(OPENJCEPLUS_TOPDIR)/target)), \ FLATTEN := true, \ DEST := $(LIB_DST_DIR), \ )) diff --git a/closed/make/modules/openjceplus/Lib.gmk b/closed/make/modules/openjceplus/Lib.gmk index 196957b73ec..b718bc25844 100644 --- a/closed/make/modules/openjceplus/Lib.gmk +++ b/closed/make/modules/openjceplus/Lib.gmk @@ -34,13 +34,22 @@ OPENJCEPLUS_JGSKIT_PLATFORM := ifeq ($(call isTargetOs, aix), true) OPENJCEPLUS_JGSKIT_PLATFORM := ppc-aix64 else ifeq ($(call isTargetOs, linux), true) - ifeq ($(call isTargetCpu, ppc64le), true) + ifeq ($(call isTargetCpu, aarch64), true) + OPENJCEPLUS_JGSKIT_PLATFORM := arm-linux64 + else ifeq ($(call isTargetCpu, ppc64le), true) OPENJCEPLUS_JGSKIT_PLATFORM := ppcle-linux64 else ifeq ($(call isTargetCpu, s390x), true) OPENJCEPLUS_JGSKIT_PLATFORM := s390-linux64 else ifeq ($(call isTargetCpu, x86_64), true) OPENJCEPLUS_JGSKIT_PLATFORM := x86-linux64 endif +else ifeq ($(call isTargetOs, macosx), true) + ifeq ($(call isTargetCpu, aarch64), true) + OPENJCEPLUS_JGSKIT_PLATFORM := aarch64-mac + else ifeq ($(call isTargetCpu, x86_64), true) + OPENJCEPLUS_JGSKIT_PLATFORM := x86_64-mac + endif + OPENJCEPLUS_JGSKIT_MAKE := jgskit.mac.mak else ifeq ($(call isTargetOs, windows), true) ifeq ($(call isTargetCpu, x86_64), true) OPENJCEPLUS_JDK := $(call MixedPath,$(OPENJCEPLUS_JDK))