diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-06-10 18:06:15 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-06-13 10:43:37 +0200 |
| commit | dbb85890a85af25db35dbd710ac07b3c704a27f0 (patch) | |
| tree | 55118347bd7251392c68a6bc613267e5bdaa31c2 /Configurations | |
| parent | 55c5c1b63a5f2497e26d734d597c40e4a36fe4af (diff) | |
Configurations/10-main.conf: reinstate soname on Solaris.
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)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/10-main.conf | 15 | ||||
| -rw-r--r-- | Configurations/shared-info.pl | 4 |
2 files changed, 9 insertions, 10 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index fed386bb30..b3fc4884e3 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -211,8 +211,11 @@ my %targets = ( ex_libs => add("-lsocket -lnsl -ldl"), dso_scheme => "dlfcn", thread_scheme => "pthreads", - shared_target => "solaris-shared", + shared_target => "self", 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-gcc" => { @@ -229,7 +232,7 @@ my %targets = ( ex_libs => add(threads("-pthread")), bn_ops => "BN_LLONG", shared_cflag => "-fPIC", - shared_ldflag => "-shared -static-libgcc", + shared_ldflag => add("-shared -static-libgcc"), }, "solaris64-x86_64-gcc" => { # -shared -static-libgcc might appear controversial, but modules @@ -251,7 +254,7 @@ my %targets = ( bn_ops => "SIXTY_FOUR_BIT_LONG", perlasm_scheme => "elf", shared_cflag => "-fPIC", - shared_ldflag => "-shared -static-libgcc", + shared_ldflag => add("-shared -static-libgcc"), multilib => "/64", }, @@ -282,7 +285,7 @@ my %targets = ( bn_ops => "SIXTY_FOUR_BIT_LONG", perlasm_scheme => "elf", shared_cflag => "-KPIC", - shared_ldflag => "-G -dy -z text", + shared_ldflag => add("-G -dy -z text"), multilib => "/64", }, @@ -298,7 +301,7 @@ my %targets = ( ex_libs => add(threads("-pthread")), bn_ops => "BN_LLONG RC4_CHAR", shared_cflag => "-fPIC", - shared_ldflag => "-shared", + shared_ldflag => add("-shared"), }, "solaris-sparcv8-gcc" => { inherit_from => [ "solaris-sparcv7-gcc", asm("sparcv8_asm") ], @@ -333,7 +336,7 @@ my %targets = ( ex_libs => add(threads("-lpthread")), bn_ops => "BN_LLONG RC4_CHAR", shared_cflag => "-KPIC", - shared_ldflag => "-G -dy -z text", + shared_ldflag => add("-G -dy -z text"), }, #### "solaris-sparcv8-cc" => { diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl index f3c4cb6f48..eb919b1f4a 100644 --- a/Configurations/shared-info.pl +++ b/Configurations/shared-info.pl @@ -65,10 +65,6 @@ my %shared_info; shared_ldflag => '-shared -Wl,-Bsymbolic -set_version $(SHLIB_VERSION_NUMBER)', }; }, - 'solaris-shared' => { - shared_ldflag => '-Wl,-Bsymbolic', - shared_defflag => '-Wl,-M,', - }, 'svr3-shared' => sub { return $shared_info{'gnu-shared'} if detect_gnu_ld(); return { |