You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2023/10/28 10:55:05 UTC

(commons-crypto) branch master updated: Use same order as other entries

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

sebb 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 9aed20c7 Use same order as other entries
9aed20c7 is described below

commit 9aed20c76368be61a670bc26a02fc033cfdcf0c6
Author: Sebb <se...@apache.org>
AuthorDate: Sat Oct 28 11:54:59 2023 +0100

    Use same order as other entries
    
    [skip ci]
---
 Makefile.common | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Makefile.common b/Makefile.common
index fd2f18dd..238dd50e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -118,10 +118,11 @@ Linux-ppc64_COMMONS_CRYPTO_FLAGS  :=
 AIX-ppc64_CC        := gcc
 AIX-ppc64_CXX       := g++
 AIX-ppc64_STRIP     := strip -X64
-AIX-ppc64_LIBNAME   := libcommons-crypto.a
 AIX-ppc64_CXXFLAGS     := -DHAVE_CONFIG_H -Ilib/inc_linux -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64
 AIX-ppc64_CFLAGS       := -DHAVE_CONFIG_H -Ilib/inc_linux -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64
 AIX-ppc64_LINKFLAGS := -shared -static-libgcc -static-libstdc++ -lcrypt
+AIX-ppc64_LIBNAME   := libcommons-crypto.a
+# TODO: AIX-ppc64_LIBNAME_OSSL3 ?
 AIX-ppc64_COMMONS_CRYPTO_FLAGS  :=
 
 SunOS-x86_CC            := gcc
@@ -223,6 +224,16 @@ Mac-arm64_LIBNAME   := libcommons-crypto.jnilib
 Mac-arm64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.jnilib
 Mac-arm64_COMMONS_CRYPTO_FLAGS  :=
 
+Mac-aarch64_CC        := gcc -arch arm64
+Mac-aarch64_CXX       := gcc -arch arm64
+Mac-aarch64_STRIP     := strip -x
+Mac-aarch64_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-aarch64_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-aarch64_LINKFLAGS := -dynamiclib -L/usr/local/lib
+Mac-aarch64_LIBNAME   := libcommons-crypto.jnilib
+Mac-aarch64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.jnilib
+Mac-aarch64_COMMONS_CRYPTO_FLAGS  :=
+
 FreeBSD-x86_64_CC           := $(CROSS_PREFIX)gcc
 FreeBSD-x86_64_CXX          := $(CROSS_PREFIX)g++
 FreeBSD-x86_64_STRIP        := $(CROSS_PREFIX)strip