From 462a9a4a19d3f231ce48c522ceb5d3a191126ef0 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Tue, 12 May 2009 16:23:09 -0500 Subject: [PATCH] Link VM with OpenSSL on NetBSD otherwise it can't find some symbols --- basis/openssl/libcrypto/libcrypto.factor | 1 + basis/openssl/libssl/libssl.factor | 1 + vm/Config.netbsd | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/basis/openssl/libcrypto/libcrypto.factor b/basis/openssl/libcrypto/libcrypto.factor index b9e00b6c8d..0eba1d2854 100644 --- a/basis/openssl/libcrypto/libcrypto.factor +++ b/basis/openssl/libcrypto/libcrypto.factor @@ -13,6 +13,7 @@ IN: openssl.libcrypto << { { [ os openbsd? ] [ ] } ! VM is linked with it + { [ os netbsd? ] [ ] } { [ os winnt? ] [ "libcrypto" "libeay32.dll" "cdecl" add-library ] } { [ os macosx? ] [ "libcrypto" "libcrypto.dylib" "cdecl" add-library ] } { [ os unix? ] [ "libcrypto" "libcrypto.so" "cdecl" add-library ] } diff --git a/basis/openssl/libssl/libssl.factor b/basis/openssl/libssl/libssl.factor index 21f712fdc8..520c7175c6 100644 --- a/basis/openssl/libssl/libssl.factor +++ b/basis/openssl/libssl/libssl.factor @@ -9,6 +9,7 @@ IN: openssl.libssl << { { [ os openbsd? ] [ ] } ! VM is linked with it + { [ os netbsd? ] [ ] } { [ os winnt? ] [ "libssl" "ssleay32.dll" "cdecl" add-library ] } { [ os macosx? ] [ "libssl" "libssl.dylib" "cdecl" add-library ] } { [ os unix? ] [ "libssl" "libssl.so" "cdecl" add-library ] } diff --git a/vm/Config.netbsd b/vm/Config.netbsd index d126747589..a6ec997ecd 100644 --- a/vm/Config.netbsd +++ b/vm/Config.netbsd @@ -2,4 +2,4 @@ include vm/Config.unix PLAF_DLL_OBJS += vm/os-genunix.o vm/os-netbsd.o CFLAGS += -export-dynamic LIBPATH = -L/usr/X11R6/lib -Wl,-rpath,/usr/X11R6/lib -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib -LIBS = -lm -lopenal -lalut $(X11_UI_LIBS) +LIBS = -lm -lssl -lcrypto $(X11_UI_LIBS)