aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2011-09-23 15:12:49 +0200
committerBjörn-Egil Dahlberg <[email protected]>2011-09-23 15:12:49 +0200
commit55bb3e1faf613c51ec59c9ee7ab4b4e967f30fda (patch)
treeb22a63ba9d1ae4ceef600916b41f5486a361e30d
parent12f3b441fc138a6e7a5bc09b8973bd55cba8b5be (diff)
parent3a490638107f1fc559d1392920ace6553a3a17dd (diff)
downloadotp-55bb3e1faf613c51ec59c9ee7ab4b4e967f30fda.tar.gz
otp-55bb3e1faf613c51ec59c9ee7ab4b4e967f30fda.tar.bz2
otp-55bb3e1faf613c51ec59c9ee7ab4b4e967f30fda.zip
Merge branch 'egil/fix-ei-cover-case' into dev
* egil/fix-ei-cover-case: ei: Add gcc link flags to port_call_SUITE Change static link test of ssl to dynamic Remove static ssl linking in crypto for otp_build
-rw-r--r--erts/configure.in2
-rw-r--r--lib/crypto/test/crypto_SUITE.erl11
-rw-r--r--lib/erl_interface/test/port_call_SUITE_data/Makefile.src2
-rwxr-xr-xotp_build12
4 files changed, 14 insertions, 13 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/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.
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
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"