The branch master has been updated via e951eca8b4bfd58f37b25d4ded6c770812443c23 (commit) via ce942199dbfc3fe8c72c60e7e0878f32b168f327 (commit) from 1ee7b8b97c90e8e59627bfcbda3714f18368a9e1 (commit)
- Log ----------------------------------------------------------------- commit e951eca8b4bfd58f37b25d4ded6c770812443c23 Author: Matt Caswell <m...@openssl.org> Date: Thu Apr 14 14:28:13 2016 +0100 Update Travis and Appveyor for change to shared by default Update the Travis and Appveyor builds to explicitly state no-shared where applicable. Reviewed-by: Richard Levitte <levi...@openssl.org> commit ce942199dbfc3fe8c72c60e7e0878f32b168f327 Author: Matt Caswell <m...@openssl.org> Date: Thu Apr 14 14:16:52 2016 +0100 Make "shared" builds the default In most cases we expect that people will be using shared libraries not static ones, therefore we make that the default. Reviewed-by: Richard Levitte <levi...@openssl.org> ----------------------------------------------------------------------- Summary of changes: .travis.yml | 18 +++++++++--------- CHANGES | 4 ++++ Configure | 1 - INSTALL | 22 +++++++++------------- NEWS | 1 + appveyor.yml | 4 ++-- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index 62675da..f180a44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,28 +23,28 @@ compiler: - gcc env: - - CONFIG_OPTS="shared" - - CONFIG_OPTS="--debug enable-crypto-mdebug enable-rc5 enable-md2" - - CONFIG_OPTS="--strict-warnings" BUILDONLY="yes" + - CONFIG_OPTS="" + - CONFIG_OPTS="--debug no-shared enable-crypto-mdebug enable-rc5 enable-md2" + - CONFIG_OPTS="--strict-warnings no-shared" BUILDONLY="yes" + - CONFIG_OPTS="--classic no-shared" BUILDONLY="yes" - CONFIG_OPTS="--classic" BUILDONLY="yes" - - CONFIG_OPTS="--classic shared" BUILDONLY="yes" - CONFIG_OPTS="no-pic --strict-warnings" BUILDONLY="yes" - - CONFIG_OPTS="no-engine --strict-warnings" BUILDONLY="yes" + - CONFIG_OPTS="no-engine no-shared --strict-warnings" BUILDONLY="yes" matrix: include: - os: linux compiler: clang-3.6 - env: CONFIG_OPTS="-fsanitize=address" + env: CONFIG_OPTS="-fsanitize=address no-shared" - os: linux compiler: clang-3.6 - env: CONFIG_OPTS="no-asm -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2 -fno-sanitize=alignment" + env: CONFIG_OPTS="no-shared no-asm -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2 -fno-sanitize=alignment" - os: linux compiler: gcc-5 - env: CONFIG_OPTS="-fsanitize=address" + env: CONFIG_OPTS="no-shared -fsanitize=address" - os: linux compiler: gcc-5 - env: CONFIG_OPTS="no-asm -fno-sanitize-recover -DPEDANTIC -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2" + env: CONFIG_OPTS="no-shared no-asm -fno-sanitize-recover -DPEDANTIC -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2" - os: linux compiler: i686-w64-mingw32-gcc env: CONFIG_OPTS="no-pic" diff --git a/CHANGES b/CHANGES index 70b846e..d6cfc0e 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,10 @@ Changes between 1.0.2g and 1.1.0 [xx XXX xxxx] + *) "shared" builds are now the default. To create only static libraries use + the "no-shared" Configure option. + [Matt Caswell] + *) Remove the no-aes, no-hmac, no-rsa, no-sha and no-md5 Configure options. All of these option have not worked for some while and are fundamental algorithms. diff --git a/Configure b/Configure index 8192f9e..a7b9ed5 100755 --- a/Configure +++ b/Configure @@ -341,7 +341,6 @@ our %disabled = ( # "what" => "comment" "md2" => "default", "rc5" => "default", "sctp" => "default", - "shared" => "default", "ssl-trace" => "default", "ssl3" => "default", "ssl3-method" => "default", diff --git a/INSTALL b/INSTALL index 3e0496d..dad2a08 100644 --- a/INSTALL +++ b/INSTALL @@ -240,10 +240,9 @@ sctp Build support for SCTP - shared - In addition to the usual static libraries, create shared - libraries on platforms where it's supported. See "Note on - shared libraries" below. + no-shared + Do not create shared libraries, only static ones. See "Note + on shared libraries" below. no-sock Don't build support for socket BIOs @@ -638,15 +637,12 @@ Note on shared libraries ------------------------ - Shared libraries have certain caveats. Binary backward compatibility - can't be guaranteed before OpenSSL version 1.0. The only reason to - use them would be to conserve memory on systems where several programs - are using OpenSSL. - - For most systems, the OpenSSL Configure script knows what is needed to - build shared libraries for libcrypto and libssl. On these systems, - the shared libraries are currently not created by default, but giving - the option "shared" will get them created. + For most systems the OpenSSL Configure script knows what is needed to + build shared libraries for libcrypto and libssl. On these systems + the shared libraries will be created by default. This can be suppressed and + only static libraries created by using the "no-shared" option. On systems + where OpenSSL does not know how to build shared libraries the "no-shared" + option will be forced and only static libraries will be created. Note on random number generation -------------------------------- diff --git a/NEWS b/NEWS index 42557a6..72f7579 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,7 @@ Major changes between OpenSSL 1.0.2g and OpenSSL 1.1.0 [in pre-release] + o "shared" builds are now the default when possible o Added support for "pipelining" o Added the AFALG engine o New threading API implemented diff --git a/appveyor.yml b/appveyor.yml index 7496a9b..46eaf39 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,9 +21,9 @@ before_build: } - ps: >- If ($env:Configuration -Match "shared") { - $env:SHARED="shared" - } Else { $env:SHARED="" + } Else { + $env:SHARED="no-shared" } - ps: $env:VSCOMNTOOLS=(Get-Content ("env:VS" + "$env:VSVER" + "0COMNTOOLS")) - call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM% _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits