openssl: macOS 10.15 beta needs explicit paths for these libraries.

10.14 has versions that are .2 lower than 10.15.

diff --git a/basis/openssl/libcrypto/libcrypto.factor b/basis/openssl/libcrypto/libcrypto.factor
index 5879aa338c9320a2ad49987ec1cf92de34e44ac2..1273ba6a21138a2103d0e22e711b7f8d05a7115b 100644 (file)
--- a/basis/openssl/libcrypto/libcrypto.factor
+++ b/basis/openssl/libcrypto/libcrypto.factor
@@ -4,15 +4,14 @@
 ! Tested with OpenSSL 0.9.8a_0 on Mac OS X 10.4.9 PowerPC
 !
 ! export LD_LIBRARY_PATH=/opt/local/lib
-
 USING: alien alien.c-types alien.destructors alien.libraries
-alien.syntax classes.struct combinators system ;
+alien.libraries.finder alien.syntax classes.struct combinators system ;
 
 IN: openssl.libcrypto
 
 << "libcrypto" {
     { [ os windows? ] [ "libcrypto-37.dll" ] }
-    { [ os macosx? ] [ "libcrypto.dylib" ] }
+    { [ os macosx? ] [ { "libcrypto.46.dylib" "libcrypto.44.dylib" } find-library-from-list ] }
     { [ os unix? ] [ "libcrypto.so" ] }
 } cond cdecl add-library >>
 

diff --git a/basis/openssl/libssl/libssl.factor b/basis/openssl/libssl/libssl.factor
index bc09b4379c3fe83dd1afbc8f23adfefb2ee76985..5337751d3071e95f59d02ea9d10ad7f18e100971 100644 (file)
--- a/basis/openssl/libssl/libssl.factor
+++ b/basis/openssl/libssl/libssl.factor
@@ -2,14 +2,14 @@
 ! Portions copyright (C) 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.destructors alien.libraries
-alien.parser alien.syntax classes.struct combinators kernel literals
-namespaces openssl.libcrypto system ;
+alien.libraries.finder alien.parser alien.syntax classes.struct
+combinators kernel literals namespaces openssl.libcrypto system ;
 
 IN: openssl.libssl
 
 << "libssl" {
     { [ os windows? ] [ "libssl-38.dll" ] }
-    { [ os macosx? ] [ "libssl.dylib" ] }
+    { [ os macosx? ] [ { "libssl.44.dylib" "libssl.42.dylib" } find-library-from-list ] }
     { [ os unix? ] [ "libssl.so" ] }
 } cond cdecl add-library >>