From 0ef40b76e745731a28f7340071c051316b8a1bae Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Wed, 13 Jun 2018 10:57:51 +0200 Subject: [PATCH] Configurations/10-main.conf: move hpux-shared flags to hpux-common. Reviewed-by: Rich Salz Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/6477) --- Configurations/10-main.conf | 21 ++++++++++++--------- Configurations/shared-info.pl | 5 ----- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 63862e7c20..152a37fa4e 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -463,7 +463,10 @@ my %targets = ( lib_cppflags => "-DB_ENDIAN", thread_scheme => "pthreads", dso_scheme => "dlfcn", # overridden in 32-bit PA-RISC builds - shared_target => "hpux-shared", + shared_target => "self", + bin_lflags => "-Wl,+s,+cdp,../:,+cdp,./:", + shared_ldflag => "-Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+cdp,../:,+cdp,./:", + shared_sonameflag=> "-Wl,+h,", }, "hpux-parisc-gcc" => { inherit_from => [ "hpux-common" ], @@ -476,7 +479,7 @@ my %targets = ( bn_ops => "BN_LLONG RC4_CHAR", dso_scheme => "dl", shared_cflag => "-fPIC", - shared_ldflag => "-shared", + shared_ldflag => add_before("-shared"), shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)", }, "hpux-parisc1_1-gcc" => { @@ -492,7 +495,7 @@ my %targets = ( ex_libs => add("-ldl", threads("-pthread")), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", shared_cflag => "-fpic", - shared_ldflag => "-shared", + shared_ldflag => add_before("-shared"), shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)", multilib => "/pa20_64", }, @@ -510,7 +513,7 @@ my %targets = ( bn_ops => "RC4_CHAR", dso_scheme => "dl", shared_cflag => "+Z", - shared_ldflag => "-b", + shared_ldflag => add_before("-b"), shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)", }, "hpux-parisc1_1-cc" => { @@ -529,7 +532,7 @@ my %targets = ( ex_libs => add("-ldl", threads("-lpthread")), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", shared_cflag => "+Z", - shared_ldflag => "-b", + shared_ldflag => add_before("-b"), shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)", multilib => "/pa20_64", }, @@ -545,7 +548,7 @@ my %targets = ( ex_libs => add("-ldl", threads("-lpthread")), bn_ops => "SIXTY_FOUR_BIT", shared_cflag => "+Z", - shared_ldflag => "-b", + shared_ldflag => add_before("-b"), shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", multilib => "/hpux32", }, @@ -559,7 +562,7 @@ my %targets = ( ex_libs => add("-ldl", threads("-lpthread")), bn_ops => "SIXTY_FOUR_BIT_LONG", shared_cflag => "+Z", - shared_ldflag => "-b", + shared_ldflag => add_before("-b"), shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", multilib => "/hpux64", }, @@ -573,7 +576,7 @@ my %targets = ( ex_libs => add("-ldl", threads("-pthread")), bn_ops => "SIXTY_FOUR_BIT", shared_cflag => "-fpic", - shared_ldflag => "-shared", + shared_ldflag => add_before("-shared"), shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", multilib => "/hpux32", }, @@ -586,7 +589,7 @@ my %targets = ( ex_libs => add("-ldl", threads("-pthread")), bn_ops => "SIXTY_FOUR_BIT_LONG", shared_cflag => "-fpic", - shared_ldflag => "-shared", + shared_ldflag => add_before("-shared"), shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", multilib => "/hpux64", }, diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl index 1a4910077f..6c5e338bc5 100644 --- a/Configurations/shared-info.pl +++ b/Configurations/shared-info.pl @@ -86,9 +86,4 @@ my %shared_info; shared_sonameflag => '-Wl,-soname=', }; }, - 'hpux-shared' => { - bin_lflags => '-Wl,+s,+cdp,../:,+cdp,./:', - shared_ldflag => '-Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+cdp,../:,+cdp,./:', - shared_sonameflag => '-Wl,+h,', - }, ); -- 2.25.1