diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-03-31 15:14:00 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-04-02 07:30:06 +0200 |
| commit | 22b414672d0260904ef2f5f5304b02f96c67dd7e (patch) | |
| tree | 4e90093b5b1bb1e1e68653dcfd245d7e90fbda2b | |
| parent | 0b45d8eec051fd9816b6bf46a975fa461ffc983d (diff) | |
Build cleanup: don't use SHARED_SOURCE with modules
SHARED_SOURCE is reserved for products that are expected to come in
dual shared / non-shared form, i.e. the routine libraries like
libcrypto and libssl, to distinguish source that should only appear in
their shared form.
Modules are always shared, so there's no need for them to have this
type of distinction.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8623)
| -rw-r--r-- | Configurations/common.tmpl | 4 | ||||
| -rwxr-xr-x | Configure | 5 | ||||
| -rw-r--r-- | engines/build.info | 12 |
3 files changed, 10 insertions, 11 deletions
diff --git a/Configurations/common.tmpl b/Configurations/common.tmpl index 5ca0d56277..62b1102c79 100644 --- a/Configurations/common.tmpl +++ b/Configurations/common.tmpl @@ -151,9 +151,9 @@ return "" if $cache{$lib}; $OUT .= obj2dso(lib => $lib, attrs => $unified_info{attributes}->{$lib}, - objs => $unified_info{shared_sources}->{$lib}, + objs => $unified_info{sources}->{$lib}, deps => [ resolvedepends($lib) ]); - foreach (@{$unified_info{shared_sources}->{$lib}}) { + foreach (@{$unified_info{sources}->{$lib}}) { # If this is somehow a compiled object, take care of it that way # Otherwise, it might simply be generated if (defined $unified_info{sources}->{$_}) { @@ -2191,9 +2191,8 @@ EOF src => [ 'sources', 'shared_sources' ], dst => 'shared_sources' } }, - modules => { dso => { src => [ 'sources', - 'shared_sources' ], - dst => 'shared_sources' } }, + modules => { dso => { src => [ 'sources' ], + dst => 'sources' } }, scripts => { script => { src => [ 'sources' ], dst => 'sources' } } } -> {$prodtype}; diff --git a/engines/build.info b/engines/build.info index 16907da50a..3189f9f343 100644 --- a/engines/build.info +++ b/engines/build.info @@ -21,7 +21,7 @@ IF[{- !$disabled{"engine"} -}] DEPEND[padlock]=../libcrypto INCLUDE[padlock]=../include IF[{- defined $target{shared_defflag} -}] - SHARED_SOURCE[padlock]=padlock.ld + SOURCE[padlock]=padlock.ld GENERATE[padlock.ld]=../util/engines.num ENDIF ENDIF @@ -31,7 +31,7 @@ IF[{- !$disabled{"engine"} -}] DEPEND[capi]=../libcrypto INCLUDE[capi]=../include IF[{- defined $target{shared_defflag} -}] - SHARED_SOURCE[capi]=capi.ld + SOURCE[capi]=capi.ld GENERATE[capi.ld]=../util/engines.num ENDIF ENDIF @@ -41,7 +41,7 @@ IF[{- !$disabled{"engine"} -}] DEPEND[afalg]=../libcrypto INCLUDE[afalg]= ../include IF[{- defined $target{shared_defflag} -}] - SHARED_SOURCE[afalg]=afalg.ld + SOURCE[afalg]=afalg.ld GENERATE[afalg.ld]=../util/engines.num ENDIF ENDIF @@ -51,7 +51,7 @@ IF[{- !$disabled{"engine"} -}] DEPEND[devcrypto]=../libcrypto INCLUDE[devcrypto]=../include IF[{- defined $target{shared_defflag} -}] - SHARED_SOURCE[devcrypto]=devcrypto.ld + SOURCE[devcrypto]=devcrypto.ld GENERATE[devcrypto.ld]=../util/engines.num ENDIF ENDIF @@ -61,14 +61,14 @@ IF[{- !$disabled{"engine"} -}] DEPEND[dasync]=../libcrypto INCLUDE[dasync]=../include IF[{- defined $target{shared_defflag} -}] - SHARED_SOURCE[dasync]=dasync.ld + SOURCE[dasync]=dasync.ld GENERATE[dasync.ld]=../util/engines.num ENDIF SOURCE[ossltest]=e_ossltest.c DEPEND[ossltest]=../libcrypto INCLUDE[ossltest]=../include IF[{- defined $target{shared_defflag} -}] - SHARED_SOURCE[ossltest]=ossltest.ld + SOURCE[ossltest]=ossltest.ld GENERATE[ossltest.ld]=../util/engines.num ENDIF ENDIF |