You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/10/23 21:50:18 UTC
[commons-crypto] branch master updated: Better name
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 2d6f82f Better name
2d6f82f is described below
commit 2d6f82fb47a0ddc8a6659203906f624a4f3f0f0e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Oct 23 17:50:14 2023 -0400
Better name
---
Makefile.common | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile.common b/Makefile.common
index d6043a8..fd2f18d 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -189,15 +189,15 @@ Linux-aarch64_LIBNAME := libcommons-crypto.so
Linux-aarch64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so
Linux-aarch64_COMMONS_CRYPTO_FLAGS :=
-ifndef Mac-INC_OPENSSL
-Mac-INC_OPENSSL := /usr/local/opt/openssl/include
+ifndef Mac_INC_OPENSSL
+Mac_INC_OPENSSL := /usr/local/opt/openssl/include
endif
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$(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_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
@@ -206,8 +206,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$(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_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
@@ -216,8 +216,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$(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_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