diff options
| -rw-r--r-- | openssl/makefile.mk | 2 | ||||
| -rw-r--r-- | openssl/openssl.patch | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/openssl/makefile.mk b/openssl/makefile.mk index 22920c296b98..10f720662e38 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -65,7 +65,7 @@ OUT2LIB = libssl.* OUT2LIB += libcrypto.* OUT2INC += include/openssl/* -.IF "$(OS)" == "LINUX" +.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" PATCH_FILES=openssllnx.patch ADDITIONAL_FILES:= \ libcrypto_OOo_0_9_8k.map \ diff --git a/openssl/openssl.patch b/openssl/openssl.patch index ed475400e2e0..90e9db0e2526 100644 --- a/openssl/openssl.patch +++ b/openssl/openssl.patch @@ -50,7 +50,19 @@ $mkdir="-mkdir" unless defined $mkdir; ($ssl,$crypto)=("ssl","crypto"); -@@ -570,7 +570,7 @@ +@@ -277,6 +277,11 @@ + chop; + + ($key,$val)=/^([^=]+)=(.*)/; ++ ++ # On some Windows machines, $val has linefeeds at the end, which confuses ++ # subsequent code in this file. So we strip all whitespace at the end. ++ $val =~ s/\s+$//; ++ + if ($key eq "RELATIVE_DIRECTORY") + { + if ($lib ne "") +@@ -570,7 +575,7 @@ printf OUT <<EOF; #ifdef $platform_cpp_symbol /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */ |