This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git
The following commit(s) were added to refs/heads/master by this push:
new 48d11ec Define and reuse Mac-INC_OPENSSL
48d11ec is described below
commit 48d11ec41096074930a37c14ba15917f3d9acae8
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Oct 23 17:04:36 2023 -0400
Define and reuse Mac-INC_OPENSSL
---
Makefile.common | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/Makefile.common b/Makefile.common
index 3d70ea2..ec820e5 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -189,11 +189,13 @@ Linux-aarch64_LIBNAME := libcommons-crypto.so
Linux-aarch64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so
Linux-aarch64_COMMONS_CRYPTO_FLAGS :=
+Mac-INC_OPENSSL := /usr/local/opt/openssl/include
+
Mac-x86_CC := gcc -arch i386
Mac-x86_CXX := g++ -arch i386
Mac-x86_STRIP := strip -x
-Mac-x86_CFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC
-mmacosx-version-min=10.4 -fvisibility=hidden -I/usr/local/include
-I/usr/local/opt/openssl/include
-Mac-x86_CXXFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC
-mmacosx-version-min=10.4 -fvisibility=hidden -I/usr/local/include
-I/usr/local/opt/openssl/include
+Mac-x86_CFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC
-mmacosx-version-min=10.4 -fvisibility=hidden -I/usr/local/include
-I$(Mac-INC_OPENSSL)
+Mac-x86_CXXFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC
-mmacosx-version-min=10.4 -fvisibility=hidden -I/usr/local/include
-I$(Mac-INC_OPENSSL)
Mac-x86_LINKFLAGS := -dynamiclib -static-libgcc -L/usr/local/lib
Mac-x86_LIBNAME := libcommons-crypto.jnilib
Mac-x86_LIBNAME_OSSL3 := libcommons-crypto-ossl3.jnilib
@@ -202,8 +204,8 @@ Mac-x86_COMMONS_CRYPTO_FLAGS :=
Mac-x86_64_CC := gcc -arch $(OS_ARCH)
Mac-x86_64_CXX := gcc -arch $(OS_ARCH)
Mac-x86_64_STRIP := strip -x
-Mac-x86_64_CFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC
-mmacosx-version-min=10.7 -fvisibility=hidden -I/usr/local/include
-I/usr/local/opt/openssl/include
-Mac-x86_64_CXXFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC
-mmacosx-version-min=10.7 -fvisibility=hidden -I/usr/local/include
-I/usr/local/opt/openssl/include
+Mac-x86_64_CFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC
-mmacosx-version-min=10.7 -fvisibility=hidden -I/usr/local/include
-I$(Mac-INC_OPENSSL)
+Mac-x86_64_CXXFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC
-mmacosx-version-min=10.7 -fvisibility=hidden -I/usr/local/include
-I$(Mac-INC_OPENSSL)
Mac-x86_64_LINKFLAGS := -dynamiclib -L/usr/local/lib
Mac-x86_64_LIBNAME := libcommons-crypto.jnilib
Mac-x86_64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.jnilib
@@ -212,8 +214,8 @@ Mac-x86_64_COMMONS_CRYPTO_FLAGS :=
Mac-arm64_CC := gcc -arch $(OS_ARCH)
Mac-arm64_CXX := gcc -arch $(OS_ARCH)
Mac-arm64_STRIP := strip -x
-Mac-arm64_CFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC
-mmacosx-version-min=11.0 -fvisibility=hidden -I/usr/local/include
-I/usr/local/opt/openssl/include
-Mac-arm64_CXXFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC
-mmacosx-version-min=11.0 -fvisibility=hidden -I/usr/local/include
-I/usr/local/opt/openssl/include
+Mac-arm64_CFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC
-mmacosx-version-min=11.0 -fvisibility=hidden -I/usr/local/include
-I$(Mac-INC_OPENSSL)
+Mac-arm64_CXXFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC
-mmacosx-version-min=11.0 -fvisibility=hidden -I/usr/local/include
-I$(Mac-INC_OPENSSL)
Mac-arm64_LINKFLAGS := -dynamiclib -L/usr/local/lib
Mac-arm64_LIBNAME := libcommons-crypto.jnilib
Mac-arm64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.jnilib
