diff options
| author | Erlang/OTP <[email protected]> | 2011-09-26 17:22:36 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2011-09-26 17:22:36 +0200 |
| commit | 9fce6b663d7183caaeed09cdb25d036d29c35215 (patch) | |
| tree | bb8bd0acad9da39a49b4aef2072d59dbbb30f3a9 | |
| parent | b98b8bdfde49de28c6c7b65f35930e5ad79eeea2 (diff) | |
| parent | edb449fc7f7ea9861b322edb6c00da907cec8c9c (diff) | |
| download | otp-9fce6b663d7183caaeed09cdb25d036d29c35215.tar.gz otp-9fce6b663d7183caaeed09cdb25d036d29c35215.tar.bz2 otp-9fce6b663d7183caaeed09cdb25d036d29c35215.zip | |
Merge branch 'sverker/remove-static-ssl-linking/OTP-9566' into maint-r14
* sverker/remove-static-ssl-linking/OTP-9566:
crypto: touch Makefile to provoke patch release
Change static link test of ssl to dynamic
Remove static ssl linking in crypto for otp_build
| -rw-r--r-- | erts/configure.in | 2 | ||||
| -rw-r--r-- | lib/crypto/Makefile | 1 | ||||
| -rw-r--r-- | lib/crypto/test/crypto_SUITE.erl | 11 | ||||
| -rwxr-xr-x | otp_build | 12 |
4 files changed, 14 insertions, 12 deletions
diff --git a/erts/configure.in b/erts/configure.in index fac07f8b6a..9dce264e2d 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -3535,7 +3535,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/Makefile b/lib/crypto/Makefile index 13eebea6a9..2a8fc6acfd 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -36,3 +36,4 @@ SPECIAL_TARGETS = include $(ERL_TOP)/make/otp_subdir.mk +# touched by patch 1176 diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl index 283aadb6ea..10b1737a91 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. @@ -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" |