Commit 22b41467 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8623)
parent 0b45d8ee

Configurations/common.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -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}->{$_}) {

Configure

+2 −3
Original line number Diff line number Diff line
@@ -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};

engines/build.info

+6 −6
Original line number Diff line number Diff line
@@ -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