Merge branch 'apple-silicon' into public/8.3

* apple-silicon: Add support for Apple Silicon - clean up legacy Apple stuff
LMS-Community · Mar 18, 2022 · 5ba7d63 · 5ba7d63
2 parents c74224e + 9fb82fe
commit 5ba7d63
Show file tree

Hide file tree

Showing 7 changed files with 153 additions and 174 deletions.
diff --git a/CPAN/Net-SSLeay-1.90.tar.gz b/CPAN/Net-SSLeay-1.90.tar.gz
diff --git a/CPAN/Net-SSLeay-1.92.tar.gz b/CPAN/Net-SSLeay-1.92.tar.gz
diff --git a/CPAN/NetSSLeay-SunOS-NoPrompt.patch → CPAN/NetSSLeay-NoPrompt.patch b/CPAN/NetSSLeay-SunOS-NoPrompt.patch → CPAN/NetSSLeay-NoPrompt.patch
diff --git a/CPAN/NetSSLeay-macOS-static.patch b/CPAN/NetSSLeay-macOS-static.patch
@@ -0,0 +1,13 @@
+--- Makefile.orig	2022-02-22 15:04:10.000000000 +0100
++++ Makefile	2022-02-22 15:04:35.000000000 +0100
+@@ -303,8 +303,8 @@
+ # Net::SSLeay might depend on some other libraries:
+ # See ExtUtils::Liblist for details
+ #
+-EXTRALIBS = -L/usr/local/opt/openssl/lib -L/usr/local/opt/openssl -lssl -lcrypto -lz
+-LDLOADLIBS = -L/usr/local/opt/openssl/lib -L/usr/local/opt/openssl -lssl -lcrypto -lz
++EXTRALIBS = -L../build/openssl/lib ../build/openssl/lib/libssl.a ../build/openssl/lib/libcrypto.a /usr/local/Cellar/zlib/1.2.11/lib/libz.a
++LDLOADLIBS = -L../build/openssl/lib ../build/openssl/lib/libssl.a ../build/openssl/lib/libcrypto.a /usr/local/Cellar/zlib/1.2.11/lib/libz.a
+ BSLOADLIBS = 
+ LD_RUN_PATH = /usr/local/opt/openssl/lib
+