]> gitweb.factorcode.org Git - factor.git/commitdiff
Revert "openssl: better attempt at finding the openssl libraries"
authorJohn Benediktsson <mrjbq7@gmail.com>
Sun, 15 Jan 2023 18:37:17 +0000 (10:37 -0800)
committerJohn Benediktsson <mrjbq7@gmail.com>
Sun, 15 Jan 2023 21:42:16 +0000 (13:42 -0800)
This reverts commit 4d0bb65da9988eed1bf3f95cafa8b87721f2d6e5.

basis/openssl/libcrypto/libcrypto.factor
basis/openssl/libssl/libssl.factor

index 567538c8b62c338d0341c8626f99b19fab2b4e1b..90d23b24cc12baff6e5edde27baf6ff2e0681ae1 100644 (file)
@@ -1,12 +1,12 @@
 ! Copyright (C) 2007 Elie CHAFTARI, 2009 Maxim Savchenko
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.destructors alien.libraries
-alien.libraries.finder alien.syntax classes.struct combinators
-system ;
+alien.syntax classes.struct combinators system ;
+
 IN: openssl.libcrypto
 
 << "libcrypto" {
-    { [ os windows? ] [ { "libcrypto-3-x64.dll" "libcrypto-37.dll" "libcrypto-38.dll" } find-library-from-list ] }
+    { [ os windows? ] [ "libcrypto-37.dll" ] }
     { [ os macosx? ] [ "libcrypto.35.dylib" ] }
     { [ os unix? ] [ "libcrypto.so" ] }
 } cond cdecl add-library >>
index 9a4df49d8c79464917e083bbabec108ce8141f89..537e10f98474f1735d94fb93b86ee61bd48a5b37 100644 (file)
@@ -8,7 +8,7 @@ words ;
 IN: openssl.libssl
 
 << "libssl" {
-    { [ os windows? ] [ { "libssl-3-x64.dll" "libssl-38.dll" } find-library-from-list ] }
+    { [ os windows? ] [ "libssl-38.dll" ] }
     { [ os macosx? ] [ "libssl.35.dylib" ] }
     { [ os unix? ] [ "libssl.so" ] }
 } cond cdecl add-library >>