diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-10-23 15:45:24 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-01-21 19:31:32 +0100 |
| commit | f5fb6f0543cafd3db6671cfb987bf475a35f30f6 (patch) | |
| tree | bea3770d1ea07835f1b7138d71b6355c8bc3d0f2 /Configurations | |
| parent | Rework building: adapt some scripts (diff) | |
| download | openssl-f5fb6f0543cafd3db6671cfb987bf475a35f30f6.tar.xz openssl-f5fb6f0543cafd3db6671cfb987bf475a35f30f6.zip | |
Rework building: Get rid of old %unified_info structures
Now that we have the names of libraries on different systems
established through platform modules, we can remove the old structure
to establish the same thing, i.e. $unified_info{sharednames} and
$unified_info{rename}. That means removing support for the RENAME and
SHARED_NAME keywords in build.info as well.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7473)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/README | 26 | ||||
| -rw-r--r-- | Configurations/common.tmpl | 3 |
2 files changed, 1 insertions, 28 deletions
diff --git a/Configurations/README b/Configurations/README index 10463aadee..c1f80fe49e 100644 --- a/Configurations/README +++ b/Configurations/README @@ -446,23 +446,6 @@ support building static libraries and DLLs at the same time, so using static libraries on Windows can only be done when configured 'no-shared'. -One some platforms, shared libraries come with a name that's different -from their static counterpart. That's declared as follows: - - SHARED_NAME[libfoo]=cygfoo-{- $config{shlibver} -} - -The example is from Cygwin, which has a required naming convention. - -Sometimes, it makes sense to rename an output file, for example a -library: - - RENAME[libfoo]=libbar - -That line has "libfoo" renamed to "libbar". While it makes no -sense at all to just have a rename like that (why not just use -"libbar" everywhere?), it does make sense when it can be used -conditionally. See a little further below for an example. - In some cases, it's desirable to include some source files in the shared form of a library only: @@ -571,15 +554,6 @@ conditions based on something in the passed variables, for example: SOURCE[libfoo]=... ENDIF -or: - - # VMS has a cultural standard where all libraries are prefixed. - # For OpenSSL, the choice is 'ossl_' - IF[{- $config{target} =~ /^vms/ -}] - RENAME[libcrypto]=ossl_libcrypto - RENAME[libssl]=ossl_libssl - ENDIF - Build-file programming with the "unified" build system ====================================================== diff --git a/Configurations/common.tmpl b/Configurations/common.tmpl index bf440d9d88..9e07a6f112 100644 --- a/Configurations/common.tmpl +++ b/Configurations/common.tmpl @@ -129,8 +129,7 @@ return "" if $cache{$lib}; unless ($disabled{shared} || $lib =~ /\.a$/) { my $obj2shlib = defined &obj2shlib ? \&obj2shlib : \&libobj2shlib; - $OUT .= $obj2shlib->(shlib => $unified_info{sharednames}->{$lib}, - lib => $lib, + $OUT .= $obj2shlib->(lib => $lib, objs => $unified_info{shared_sources}->{$lib}, deps => [ reducedepends(resolvedepends($lib)) ], installed => is_installed($lib)); |