[openssl-commits] [openssl] OpenSSL_1_1_0-stable update
Richard Levitte
levitte at openssl.org
Tue Jan 23 12:58:03 UTC 2018
The branch OpenSSL_1_1_0-stable has been updated
via 0a05bbf8f434ba9df8c647e5475ff02997a83e0c (commit)
via 4f321cc19e28442e313b6915a1b9928e77a75ab7 (commit)
from 43b560d5ac67d15c2e38b72f4c055d6efa3e5be1 (commit)
- Log -----------------------------------------------------------------
commit 0a05bbf8f434ba9df8c647e5475ff02997a83e0c
Author: Richard Levitte <levitte at openssl.org>
Date: Mon Jan 22 16:53:23 2018 +0100
Don't add $(EX_LIBS) to libssl.pc's Libs.private
Since libssl requires libcrypto and libcrypto.pc already has
Libs.private set exactly the same, there's no reason to repeat it in
libssl.pc.
Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5135)
commit 4f321cc19e28442e313b6915a1b9928e77a75ab7
Author: Richard Levitte <levitte at openssl.org>
Date: Mon Jan 22 16:50:54 2018 +0100
Add anything specifying a threads library to ex_libs
Even -pthread gets treated that way. The reason to do this is so it
ends up in 'Libs.private' in libcrypto.pc.
Fixes #3884
Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5135)
-----------------------------------------------------------------------
Summary of changes:
Configurations/10-main.conf | 19 ++++++++++++-------
Configurations/unix-Makefile.tmpl | 1 -
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index dcf3902..2a944eb 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -204,6 +204,7 @@ sub vms_info {
debug => "-O0 -g",
release => "-O3 -fomit-frame-pointer"),
threads("-pthread")),
+ ex_libs => add(threads("-pthread")),
bn_ops => "BN_LLONG",
shared_cflag => "-fPIC",
shared_ldflag => "-shared -static-libgcc",
@@ -223,6 +224,7 @@ sub vms_info {
debug => "-O0 -g",
release => "-O3"),
threads("-pthread")),
+ ex_libs => add(threads("-pthread")),
bn_ops => "SIXTY_FOUR_BIT_LONG",
perlasm_scheme => "elf",
shared_cflag => "-fPIC",
@@ -268,6 +270,7 @@ sub vms_info {
debug => "-O0 -g",
release => "-O3"),
threads("-pthread")),
+ ex_libs => add(threads("-pthread")),
bn_ops => "BN_LLONG RC4_CHAR",
shared_cflag => "-fPIC",
shared_ldflag => "-shared",
@@ -432,7 +435,7 @@ sub vms_info {
debug => "-O0 -g",
release => "-O3"),
threads("-pthread")),
- ex_libs => add("-Wl,+s -ldld"),
+ ex_libs => add("-Wl,+s -ldld", threads("-pthread")),
bn_ops => "BN_LLONG",
thread_scheme => "pthreads",
dso_scheme => "dl",
@@ -551,7 +554,7 @@ sub vms_info {
debug => "-O0 -g",
release => "-O3"),
threads("-pthread")),
- ex_libs => add("-ldl"),
+ ex_libs => add("-ldl", threads("-pthread")),
bn_ops => "SIXTY_FOUR_BIT",
thread_scheme => "pthreads",
dso_scheme => "dlfcn",
@@ -568,7 +571,7 @@ sub vms_info {
debug => "-O0 -g",
release => "-O3"),
threads("-pthread")),
- ex_libs => add("-ldl"),
+ ex_libs => add("-ldl", threads("-pthread")),
bn_ops => "SIXTY_FOUR_BIT_LONG",
thread_scheme => "pthreads",
dso_scheme => "dlfcn",
@@ -599,7 +602,7 @@ sub vms_info {
cc => "gcc",
cflags => combine("-std=c9x -D_XOPEN_SOURCE=500 -D_OSF_SOURCE -O3",
threads("-pthread")),
- ex_libs => "-lrt", # for mlock(2)
+ ex_libs => add("-lrt", threads("-pthread")), # for mlock(2)
bn_ops => "SIXTY_FOUR_BIT_LONG",
thread_scheme => "pthreads",
dso_scheme => "dlfcn",
@@ -611,7 +614,7 @@ sub vms_info {
cc => "cc",
cflags => combine("-std1 -D_XOPEN_SOURCE=500 -D_OSF_SOURCE -tune host -fast -readonly_strings",
threads("-pthread")),
- ex_libs => "-lrt", # for mlock(2)
+ ex_libs => add("-lrt", threads("-pthread")), # for mlock(2)
bn_ops => "SIXTY_FOUR_BIT_LONG",
thread_scheme => "pthreads",
dso_scheme => "dlfcn",
@@ -632,7 +635,7 @@ sub vms_info {
debug => "-O0 -g",
release => "-O3"),
threads("-pthread")),
- ex_libs => add("-ldl"),
+ ex_libs => add("-ldl", threads("-pthread")),
bn_ops => "BN_LLONG RC4_CHAR",
thread_scheme => "pthreads",
dso_scheme => "dlfcn",
@@ -1177,6 +1180,7 @@ sub vms_info {
debug => "-O0 -g",
release => "-O"),
threads("-pthread")),
+ ex_libs => add(threads("-pthread")),
sys_id => "AIX",
bn_ops => "BN_LLONG RC4_CHAR",
thread_scheme => "pthreads",
@@ -1194,6 +1198,7 @@ sub vms_info {
debug => "-O0 -g",
release => "-O"),
threads("-pthread")),
+ ex_libs => add(threads("-pthread")),
sys_id => "AIX",
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
thread_scheme => "pthreads",
@@ -1647,7 +1652,7 @@ sub vms_info {
cc => "gcc",
cflags => combine("-DL_ENDIAN -O3 -fomit-frame-pointer -Wall",
threads("-pthread")),
- ex_libs => add("-ldl"),
+ ex_libs => add("-ldl", threads("-pthread")),
bn_ops => "BN_LLONG",
thread_scheme => "pthreads",
dso_scheme => "dlfcn",
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 454aff3..a1ef7e6 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -721,7 +721,6 @@ libssl.pc:
echo 'Version: '$(VERSION); \
echo 'Requires.private: libcrypto'; \
echo 'Libs: -L$${libdir} -lssl'; \
- echo 'Libs.private: $(EX_LIBS)'; \
echo 'Cflags: -I$${includedir}' ) > libssl.pc
openssl.pc:
More information about the openssl-commits
mailing list