mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-11 14:22:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Configurations/10-main.conf: reinstate soname on Solaris.

Browse Source 
The flag was apparently omitted in switch from Makefile.shared to
shared-info.pl. Do put it back! And in the process move all
solaris-shared flags from shared-info.pl to solaris-common.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6446)
This commit is contained in:
Andy Polyakov 2018-06-10 18:06:15 +02:00
parent 55c5c1b63a
commit dbb85890a8
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Configurations/10-main.conf
View File

@ -211,8 +211,11 @@ my %targets = (
ex_libs => add("-lsocket -lnsl -ldl"), ex_libs => add("-lsocket -lnsl -ldl"),
dso_scheme => "dlfcn", dso_scheme => "dlfcn",
thread_scheme => "pthreads", thread_scheme => "pthreads",
shared_target => "solaris-shared", shared_target => "self",
shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
shared_ldflag => "-Wl,-Bsymbolic",
shared_defflag => "-Wl,-M,",
shared_sonameflag=> "-Wl,-h,",
}, },
#### Solaris x86 with GNU C setups #### Solaris x86 with GNU C setups
"solaris-x86-gcc" => { "solaris-x86-gcc" => {
@ -229,7 +232,7 @@ my %targets = (
ex_libs => add(threads("-pthread")), ex_libs => add(threads("-pthread")),
bn_ops => "BN_LLONG", bn_ops => "BN_LLONG",
shared_cflag => "-fPIC", shared_cflag => "-fPIC",
shared_ldflag => "-shared -static-libgcc", shared_ldflag => add("-shared -static-libgcc"),
}, },
"solaris64-x86_64-gcc" => { "solaris64-x86_64-gcc" => {
# -shared -static-libgcc might appear controversial, but modules # -shared -static-libgcc might appear controversial, but modules
@ -251,7 +254,7 @@ my %targets = (
bn_ops => "SIXTY_FOUR_BIT_LONG", bn_ops => "SIXTY_FOUR_BIT_LONG",
perlasm_scheme => "elf", perlasm_scheme => "elf",
shared_cflag => "-fPIC", shared_cflag => "-fPIC",
shared_ldflag => "-shared -static-libgcc", shared_ldflag => add("-shared -static-libgcc"),
multilib => "/64", multilib => "/64",
}, },
@ -282,7 +285,7 @@ my %targets = (
bn_ops => "SIXTY_FOUR_BIT_LONG", bn_ops => "SIXTY_FOUR_BIT_LONG",
perlasm_scheme => "elf", perlasm_scheme => "elf",
shared_cflag => "-KPIC", shared_cflag => "-KPIC",
shared_ldflag => "-G -dy -z text", shared_ldflag => add("-G -dy -z text"),
multilib => "/64", multilib => "/64",
}, },
@ -298,7 +301,7 @@ my %targets = (
ex_libs => add(threads("-pthread")), ex_libs => add(threads("-pthread")),
bn_ops => "BN_LLONG RC4_CHAR", bn_ops => "BN_LLONG RC4_CHAR",
shared_cflag => "-fPIC", shared_cflag => "-fPIC",
shared_ldflag => "-shared", shared_ldflag => add("-shared"),
}, },
"solaris-sparcv8-gcc" => { "solaris-sparcv8-gcc" => {
inherit_from => [ "solaris-sparcv7-gcc", asm("sparcv8_asm") ], inherit_from => [ "solaris-sparcv7-gcc", asm("sparcv8_asm") ],
@ -333,7 +336,7 @@ my %targets = (
ex_libs => add(threads("-lpthread")), ex_libs => add(threads("-lpthread")),
bn_ops => "BN_LLONG RC4_CHAR", bn_ops => "BN_LLONG RC4_CHAR",
shared_cflag => "-KPIC", shared_cflag => "-KPIC",
shared_ldflag => "-G -dy -z text", shared_ldflag => add("-G -dy -z text"),
}, },
#### ####
"solaris-sparcv8-cc" => { "solaris-sparcv8-cc" => {

4
Configurations/shared-info.pl
View File

@ -65,10 +65,6 @@ my %shared_info;
shared_ldflag => '-shared -Wl,-Bsymbolic -set_version $(SHLIB_VERSION_NUMBER)', shared_ldflag => '-shared -Wl,-Bsymbolic -set_version $(SHLIB_VERSION_NUMBER)',
}; };
}, },
'solaris-shared' => {
shared_ldflag => '-Wl,-Bsymbolic',
shared_defflag => '-Wl,-M,',
},
'svr3-shared' => sub { 'svr3-shared' => sub {
return $shared_info{'gnu-shared'} if detect_gnu_ld(); return $shared_info{'gnu-shared'} if detect_gnu_ld();
return { return {