From 8c1b51850b78fdb70639c34eca983d83f4827240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Wed, 21 Sep 2011 19:44:34 +0200
Subject: Remove static ssl linking in crypto for otp_build

---
 erts/configure.in |  2 +-
 otp_build         | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/erts/configure.in b/erts/configure.in
index 03e27c9dad..3b9be41345 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -3538,7 +3538,7 @@ AC_SUBST(STATIC_KERBEROS_LIBS)
 AC_SUBST(SSL_LINK_WITH_ZLIB)
 AC_SUBST(STATIC_ZLIB_LIBS)
 
-std_ssl_locations="/usr/local /usr/sfw /opt/local /usr /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl"
+std_ssl_locations="/usr/local /usr/sfw /usr /opt/local /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl"
 
 AC_ARG_WITH(ssl-zlib,
 AS_HELP_STRING([--with-ssl-zlib=PATH],
diff --git a/otp_build b/otp_build
index aed34b76a8..44bbab22b5 100755
--- a/otp_build
+++ b/otp_build
@@ -186,15 +186,15 @@ set_config_flags ()
 	if target_contains free_source; then
 		CONFIG_FLAGS="$CONFIG_FLAGS --host=$TARGET"
 	fi
-	# Link SSL static for all binary distributions if not overridden
-	# Even for win32 starting with R14B03
-	XX=`echo $* | grep -v dynamic-ssl-lib`
-	if [ "$*" = "$XX" ]; then 
-	    CONFIG_FLAGS="--disable-dynamic-ssl-lib $CONFIG_FLAGS"
-	fi
+	# Link SSL static for win32 binary distributions if not overridden
 	if target_contains win32; then
+	    XX=`echo $* | grep -v dynamic-ssl-lib`
+	    if [ "$*" = "$XX" ]; then 
+		CONFIG_FLAGS="--disable-dynamic-ssl-lib $CONFIG_FLAGS"
+	    fi
 	    CONFIG_FLAGS="--build=$BUILDSYS build_alias=win32 --host=win32 --target=win32 $CONFIG_FLAGS" 
 	fi
+	    
 
 	if [ "x$OVERRIDE_CONFIG_CACHE" = "x" ]; then
 	    CONFIG_FLAGS="$CONFIG_FLAGS --cache-file=/dev/null"
-- 
cgit v1.2.3


From 276afa6f6e2bf7b70c5f0e2f01d6d5eb97443dd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Thu, 22 Sep 2011 14:28:30 +0200
Subject: Change static link test of ssl to dynamic

Only used for commercial builds
---
 lib/crypto/test/crypto_SUITE.erl | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 2fa058c852..26d10d892a 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -138,14 +138,15 @@ link_test_2(Drv) ->
 	    Libs = os:cmd(Cmd),
 	    io:format("~p\n", [Libs]),
 	    case string:str(Libs, "libcrypto") of
-		0 -> ok;
-		_ ->
+		0 -> 
 		    case ?t:is_commercial() of
 			true ->
-			    ?t:fail({libcrypto,not_statically_linked});
+			    ?t:fail({libcrypto,statically_linked});
 			false ->
-			    {comment,"Not statically linked (OK for open-source platform)"}
-		    end
+			    {comment,"Statically linked (OK for open-source platform)"}
+		    end;
+		_ ->
+		    ok
 	    end
     end.
 
-- 
cgit v1.2.3


From 3a490638107f1fc559d1392920ace6553a3a17dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Thu, 22 Sep 2011 17:01:17 +0200
Subject: ei: Add gcc link flags to port_call_SUITE

---
 lib/erl_interface/test/port_call_SUITE_data/Makefile.src | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/erl_interface/test/port_call_SUITE_data/Makefile.src b/lib/erl_interface/test/port_call_SUITE_data/Makefile.src
index dc7385ba32..0799187d64 100644
--- a/lib/erl_interface/test/port_call_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/port_call_SUITE_data/Makefile.src
@@ -26,7 +26,7 @@ LIBPATH = @erl_interface_libpath@
 LIBERL = $(LIBPATH)/@erl_interface_lib_drv@
 LIBEI = $(LIBPATH)/@erl_interface_eilib_drv@
 
-SHLIB_EXTRA_LDLIBS = $(LIBERL) $(LIBEI) 
+SHLIB_EXTRA_LDLIBS = $(LIBERL) $(LIBEI) @erl_interface_threadlib@
 SHLIB_EXTRA_CFLAGS = -I@erl_interface_include@ -I../all_SUITE_data
 
 
-- 
cgit v1.2.3