summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
0b45d8e)
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)
return "" if $cache{$lib};
$OUT .= obj2dso(lib => $lib,
attrs => $unified_info{attributes}->{$lib},
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) ]);
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}->{$_}) {
# If this is somehow a compiled object, take care of it that way
# Otherwise, it might simply be generated
if (defined $unified_info{sources}->{$_}) {
src => [ 'sources',
'shared_sources' ],
dst => 'shared_sources' } },
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};
scripts => { script => { src => [ 'sources' ],
dst => 'sources' } }
} -> {$prodtype};
DEPEND[padlock]=../libcrypto
INCLUDE[padlock]=../include
IF[{- defined $target{shared_defflag} -}]
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
GENERATE[padlock.ld]=../util/engines.num
ENDIF
ENDIF
DEPEND[capi]=../libcrypto
INCLUDE[capi]=../include
IF[{- defined $target{shared_defflag} -}]
DEPEND[capi]=../libcrypto
INCLUDE[capi]=../include
IF[{- defined $target{shared_defflag} -}]
- SHARED_SOURCE[capi]=capi.ld
GENERATE[capi.ld]=../util/engines.num
ENDIF
ENDIF
GENERATE[capi.ld]=../util/engines.num
ENDIF
ENDIF
DEPEND[afalg]=../libcrypto
INCLUDE[afalg]= ../include
IF[{- defined $target{shared_defflag} -}]
DEPEND[afalg]=../libcrypto
INCLUDE[afalg]= ../include
IF[{- defined $target{shared_defflag} -}]
- SHARED_SOURCE[afalg]=afalg.ld
GENERATE[afalg.ld]=../util/engines.num
ENDIF
ENDIF
GENERATE[afalg.ld]=../util/engines.num
ENDIF
ENDIF
DEPEND[devcrypto]=../libcrypto
INCLUDE[devcrypto]=../include
IF[{- defined $target{shared_defflag} -}]
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
GENERATE[devcrypto.ld]=../util/engines.num
ENDIF
ENDIF
DEPEND[dasync]=../libcrypto
INCLUDE[dasync]=../include
IF[{- defined $target{shared_defflag} -}]
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} -}]
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
GENERATE[ossltest.ld]=../util/engines.num
ENDIF
ENDIF