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 /build.info | |
| 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 'build.info')
| -rw-r--r-- | build.info | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/build.info b/build.info index afcb772caf..bea1441847 100644 --- a/build.info +++ b/build.info @@ -2,15 +2,6 @@ # %skipdir there for further explanations. SUBDIRS=crypto ssl apps test util tools fuzz engines -{- - my @sover = split(/\./, $config{shlib_version}); - our $sover_filename; - $sover_filename = join('.', @sover) - if $config{target} =~ /^mingw/ || $config{target} =~ /^VC-/; - $sover_filename = join('', map { sprintf "%02d", $_ } @sover) - if $config{target} =~ /^vms/; - ""; --} LIBS=libcrypto libssl INCLUDE[libcrypto]=. crypto/include include INCLUDE[libssl]=. include @@ -44,26 +35,3 @@ IF[{- $config{target} =~ /^(?:Cygwin|mingw|VC-)/ -}] SHARED_SOURCE[libcrypto]=libcrypto.rc SHARED_SOURCE[libssl]=libssl.rc ENDIF - -IF[{- $config{target} =~ /^Cygwin/ -}] - SHARED_NAME[libcrypto]=cygcrypto-{- $sover_filename -} - SHARED_NAME[libssl]=cygssl-{- $sover_filename -} -ELSIF[{- $config{target} =~ /^mingw/ -}] - SHARED_NAME[libcrypto]=libcrypto-{- $sover_filename -}{- $config{target} eq "mingw64" ? "-x64" : "" -} - SHARED_NAME[libssl]=libssl-{- $sover_filename -}{- $config{target} eq "mingw64" ? "-x64" : "" -} -ELSIF[{- $config{target} =~ /^VC-/ -}] - SHARED_NAME[libcrypto]=libcrypto-{- $sover_filename -}{- $target{multilib} -} - SHARED_NAME[libssl]=libssl-{- $sover_filename -}{- $target{multilib} -} -ENDIF - -# VMS has a cultural standard where all libraries are prefixed. -# For OpenSSL, the choice is 'ossl$' (this prefix was claimed in a -# conversation with VSI, Tuesday January 26 2016) -# Also, it seems it's usual to have the pointer size the libraries -# were built for as part of the name. -IF[{- $config{target} =~ /^vms/ -}] - RENAME[libcrypto]=ossl$libcrypto{- $target{pointer_size} -} - RENAME[libssl]=ossl$libssl{- $target{pointer_size} -} - SHARED_NAME[libcrypto]=ossl$libcrypto{- $sover_filename -}_shr{- $target{pointer_size} -} - SHARED_NAME[libssl]=ossl$libssl{- $sover_filename -}_shr{- $target{pointer_size} -} -ENDIF |