diff options
author | Matt Caswell <matt@openssl.org> | 2016-04-14 13:44:15 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-04-14 16:41:03 +0100 |
commit | d90a6beb0e8b519e345204cc533597a2e563dab5 (patch) | |
tree | 572d1c4d34de850f3bed7e609894acebcd4fb0df /apps/build.info | |
parent | c3a64b52788df139d649efaaf993c27dc89ba6ce (diff) |
Fix no-stdio and no-autoalginit
no-stdio does not work with the apps. Since the tests also need the apps
it doesn't support that either. Therefore we disable building of both.
no-autoalginit is not compatible with the apps because it requires explicit
loading of the algorithms, and the apps don't do that. Therefore we disable
building the apps for this option. Similarly the tests depend on the apps
so we also disable the tests. Finally the whole point about no-autoalginit
is to avoid excessive executable sizes when doing static linking. Therefore
we disable "shared" if this option is selected.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps/build.info')
-rw-r--r-- | apps/build.info | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/apps/build.info b/apps/build.info index d8ad19702c..3baba66feb 100644 --- a/apps/build.info +++ b/apps/build.info @@ -1,19 +1,21 @@ {- use File::Spec::Functions qw/catdir rel2abs/; -} -PROGRAMS=openssl -SOURCE[openssl]=\ - openssl.c \ - asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c dgst.c dhparam.c \ - dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c errstr.c gendsa.c \ - genpkey.c genrsa.c nseq.c ocsp.c passwd.c pkcs12.c pkcs7.c pkcs8.c \ - pkey.c pkeyparam.c pkeyutl.c prime.c rand.c req.c rsa.c rsautl.c \ - s_client.c s_server.c s_time.c sess_id.c smime.c speed.c spkac.c \ - srp.c ts.c verify.c version.c x509.c rehash.c \ - apps.c opt.c s_cb.c s_socket.c \ - app_rand.c \ - {- $target{apps_aux_src} -} -INCLUDE[openssl]={- rel2abs(catdir($builddir,"../include")) -} .. ../include -DEPEND[openssl]=../libssl +IF[{- !$disabled{apps} -}] + PROGRAMS=openssl + SOURCE[openssl]=\ + openssl.c \ + asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c dgst.c dhparam.c \ + dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c errstr.c gendsa.c \ + genpkey.c genrsa.c nseq.c ocsp.c passwd.c pkcs12.c pkcs7.c pkcs8.c \ + pkey.c pkeyparam.c pkeyutl.c prime.c rand.c req.c rsa.c rsautl.c \ + s_client.c s_server.c s_time.c sess_id.c smime.c speed.c spkac.c \ + srp.c ts.c verify.c version.c x509.c rehash.c \ + apps.c opt.c s_cb.c s_socket.c \ + app_rand.c \ + {- $target{apps_aux_src} -} + INCLUDE[openssl]={- rel2abs(catdir($builddir,"../include")) -} .. ../include + DEPEND[openssl]=../libssl -SCRIPTS=CA.pl tsget -SOURCE[CA.pl]=CA.pl.in -SOURCE[tsget]=tsget.in + SCRIPTS=CA.pl tsget + SOURCE[CA.pl]=CA.pl.in + SOURCE[tsget]=tsget.in +ENDIF |