[openssl-commits] [openssl] master update
Andy Polyakov
appro at openssl.org
Thu Jun 14 19:25:18 UTC 2018
The branch master has been updated
via 82b6b0848cea95de821a7f901bd8b0b5dab17fa4 (commit)
via 0ef40b76e745731a28f7340071c051316b8a1bae (commit)
from 17e822e9f85e4cd65eba1dd4ba710749aa71793f (commit)
- Log -----------------------------------------------------------------
commit 82b6b0848cea95de821a7f901bd8b0b5dab17fa4
Author: Andy Polyakov <appro at openssl.org>
Date: Wed Jun 13 11:10:27 2018 +0200
Configurations/10-main.conf: improve Makefile readability on AIX and Solaris.
Reviewed-by: Rich Salz <rsalz at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6477)
commit 0ef40b76e745731a28f7340071c051316b8a1bae
Author: Andy Polyakov <appro at openssl.org>
Date: Wed Jun 13 10:57:51 2018 +0200
Configurations/10-main.conf: move hpux-shared flags to hpux-common.
Reviewed-by: Rich Salz <rsalz at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6477)
-----------------------------------------------------------------------
Summary of changes:
Configurations/10-main.conf | 35 +++++++++++++++++++----------------
Configurations/shared-info.pl | 5 -----
2 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 63862e7..54f609d 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -232,7 +232,7 @@ my %targets = (
ex_libs => add(threads("-pthread")),
bn_ops => "BN_LLONG",
shared_cflag => "-fPIC",
- shared_ldflag => add("-shared -static-libgcc"),
+ shared_ldflag => add_before("-shared -static-libgcc"),
},
"solaris64-x86_64-gcc" => {
# -shared -static-libgcc might appear controversial, but modules
@@ -254,7 +254,7 @@ my %targets = (
bn_ops => "SIXTY_FOUR_BIT_LONG",
perlasm_scheme => "elf",
shared_cflag => "-fPIC",
- shared_ldflag => add("-shared -static-libgcc"),
+ shared_ldflag => add_before("-shared -static-libgcc"),
multilib => "/64",
},
@@ -285,7 +285,7 @@ my %targets = (
bn_ops => "SIXTY_FOUR_BIT_LONG",
perlasm_scheme => "elf",
shared_cflag => "-KPIC",
- shared_ldflag => add("-G -dy -z text"),
+ shared_ldflag => add_before("-G -dy -z text"),
multilib => "/64",
},
@@ -301,7 +301,7 @@ my %targets = (
ex_libs => add(threads("-pthread")),
bn_ops => "BN_LLONG RC4_CHAR",
shared_cflag => "-fPIC",
- shared_ldflag => add("-shared"),
+ shared_ldflag => add_before("-shared"),
},
"solaris-sparcv8-gcc" => {
inherit_from => [ "solaris-sparcv7-gcc", asm("sparcv8_asm") ],
@@ -336,7 +336,7 @@ my %targets = (
ex_libs => add(threads("-lpthread")),
bn_ops => "BN_LLONG RC4_CHAR",
shared_cflag => "-KPIC",
- shared_ldflag => add("-G -dy -z text"),
+ shared_ldflag => add_before("-G -dy -z text"),
},
####
"solaris-sparcv8-cc" => {
@@ -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",
},
@@ -1140,7 +1143,7 @@ my %targets = (
ex_libs => threads("-pthread"),
bn_ops => "BN_LLONG RC4_CHAR",
perlasm_scheme => "aix32",
- shared_ldflag => add("-shared -static-libgcc"),
+ shared_ldflag => add_before("-shared -static-libgcc"),
AR => add("-X32"),
RANLIB => add("-X32"),
},
@@ -1153,7 +1156,7 @@ my %targets = (
ex_libs => threads("-pthread"),
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
perlasm_scheme => "aix64",
- shared_ldflag => add("-shared -static-libgcc"),
+ shared_ldflag => add_before("-shared -static-libgcc"),
AR => add("-X64"),
RANLIB => add("-X64"),
},
diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl
index 1a49100..6c5e338 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,',
- },
);
More information about the openssl-commits
mailing list