diff options
author | Richard Levitte <levitte@openssl.org> | 2017-12-01 15:40:43 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2017-12-12 17:18:07 +0100 |
commit | 793077d0beccfa20c9962546393128b92a7e68e4 (patch) | |
tree | 9dde7c5af9f933ca16405bfd173dab2b7371435e /Configurations | |
parent | 3b6c4b07364797566c2c1fd75e499b2d9dd73506 (diff) |
Configure: Read in extra information to help create shared libraries
This will replace the use of Makefile.shared
This also means a small adjustment on how the attributes dso_cflags,
dso_cxxflags and dso_lflags are treated. They were previously treated
as an extension to shared_cflag, shared_cxxflag and shared_ldflag, but
they should really be regarded as alternatives instead, for example
for darwin, where -dynamiclib is used for shared libraries and -bundle
for DSOs.
We take the opportunity to clean out things that are redundant or
otherwise superfluous (for example the check of GNU ld on platforms
where it never existed).
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4840)
Diffstat (limited to 'Configurations')
-rw-r--r-- | Configurations/shared-info.pl | 102 | ||||
-rw-r--r-- | Configurations/unix-Makefile.tmpl | 11 | ||||
-rw-r--r-- | Configurations/windows-makefile.tmpl | 4 |
3 files changed, 110 insertions, 7 deletions
diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl new file mode 100644 index 0000000000..c5ebfc6e37 --- /dev/null +++ b/Configurations/shared-info.pl @@ -0,0 +1,102 @@ +#! /usr/bin/env perl +# -*- mode: perl; -*- +# Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + +# This is a collection of extra attributes to be used as input for creating +# shared libraries, currently on any Unix variant, including Unix like +# environments on Windows. + +sub detect_gnu_ld { + my @lines = + `$config{cross_compile_prefix}$target{cc} -Wl,-V /dev/null 2>&1`; + return grep /^GNU ld/, @lines; +} +sub detect_gnu_cc { + my @lines = + `$config{cross_compile_prefix}$target{cc} -v 2>&1`; + return grep /gcc/, @lines; +} + +my %shared_info; +%shared_info = ( + 'gnu-shared' => { + shared_ldflag => '-shared -Wl,-Bsymbolic', + shared_sonameflag => '-Wl,-soname=', + }, + 'linux-shared' => sub { + return { + %{$shared_info{'gnu-shared'}}, + shared_defflag => '-Wl,--version-script=', + }; + }, + 'bsd-gcc-shared' => sub { return $shared_info{'linux-shared'}; }, + 'bsd-shared' => sub { + return $shared_info{'gnu-shared'} if detect_gnu_ld(); + return { + shared_ldflag => '-shared -nostdlib', + }; + }, + 'darwin-shared' => { + dso_lflags => '-bundle', + shared_ldflag => '-dynamiclib -current_version $(SHLIB_VERSION_NUMBER) -compatibility_version $(SHLIB_VERSION_NUMBER)', + shared_sonameflag => '-install_name $(INSTALLTOP)/$(LIBDIR)/', + }, + 'cygwin-shared' => { + shared_ldflag => '-shared -Wl,--enable-auto-image-base', + shared_impflag => '-Wl,--out-implib=', + }, + 'mingw-shared' => sub { + return { + %{$shared_info{'cygwin-shared'}}, + # def_flag made to empty string so it still generates + # something + shared_defflag => '', + }; + }, + 'alpha-osf1-shared' => sub { + return $shared_info{'gnu-shared'} if detect_gnu_ld(); + return { + dso_lflags => '-shared -Wl,-Bsymbolic', + 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 { + shared_ldflag => '-G', + shared_sonameflag => '-h ', + }; + }, + 'svr5-shared' => sub { + return $shared_info{'gnu-shared'} if detect_gnu_ld(); + return { + shared_ldflag => detect_gnu_cc() ? '-shared' : '-G', + shared_sonameflag => '-h ', + }; + }, + 'irix-shared' => sub { + return $shared_info{'gnu-shared'} if detect_gnu_ld(); + return { + shared_ldflag => '-shared -Wl,-Bsymbolic', + 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,', + }, + 'aix-shared' => { + bin_lflags => '-Wl,-bsvr4', + shared_ldflag => '-Wl,-bexpall,-bnolibpath,-bM:SRE', + }, +); diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index d66160f3c0..08ad527c2b 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -195,11 +195,12 @@ EX_LIBS= {- $target{ex_libs} -} {- $config{ex_libs} -} LIB_CFLAGS={- $target{shared_cflag} || "" -} LIB_CXXFLAGS={- $target{shared_cxxflag} || "" -} LIB_LDFLAGS={- $target{shared_ldflag}." ".$config{shared_ldflag} -} -DSO_CFLAGS={- $target{shared_cflag} || "" -} -DSO_CXXFLAGS={- $target{shared_cxxflag} || "" -} -DSO_LDFLAGS=$(LIB_LDFLAGS) -BIN_CFLAGS={- $target{bin_cflags} -} -BIN_CXXFLAGS={- $target{bin_cxxflag} || "" -} +DSO_CFLAGS={- $target{dso_cflags} || "" -} +DSO_CXXFLAGS={- $target{dso_cxxflags} || "" -} +DSO_LDFLAGS={- $target{dso_lflags} || "" -} +BIN_CFLAGS={- $target{bin_cflags} || "" -} +BIN_CXXFLAGS={- $target{bin_cxxflags} || "" -} +BIN_LDFLAGS={- $target{bin_lflags} || "" -} PERL={- $config{perl} -} diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 0ea1bbab95..db79cd3ce1 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -169,8 +169,8 @@ LDOUTFLAG={- $target{loutflag} || "/out:" -}$(OSSL_EMPTY) EX_LIBS={- $target{ex_libs} -} LIB_CFLAGS={- join(" ", $target{lib_cflags}, $target{shared_cflag}) || "" -} LIB_LDFLAGS={- $target{shared_ldflag} || "" -} -DSO_CFLAGS={- join(" ", $target{dso_cflags}, $target{shared_cflag}) || "" -} -DSO_LDFLAGS={- join(" ", $target{dso_lflags}, $target{shared_ldflag}) || "" -} +DSO_CFLAGS={- $target{dso_cflags} || "" -} +DSO_LDFLAGS={- $target{dso_ldflag} || "" -} BIN_CFLAGS={- $target{bin_cflags} -} BIN_LDFLAGS={- $target{bin_lflags} -} |