diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-02-26 14:39:16 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-03-02 03:34:30 +0100 |
| commit | a3f1fc25017ef768a956b88edee4aaf851a58db2 (patch) | |
| tree | ae8dbfa1e97ac3c6ea9ad77fe6bffa3fbe7f0648 /Configurations | |
| parent | e42921790267d54054cde1596711219b72a184ad (diff) | |
Build: Generate apps/progs.c and apps/progs.h in build time
util/progs.pl depends on the build tree (on configdata.pm,
specifically), so it needs to be run from the build tree. But why
stop there? We might as well generate apps/progs.c and apps/progs.h
when building.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11185)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 4 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 10 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 4 |
3 files changed, 6 insertions, 12 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index bf22e40dc4..8ce6e78999 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -140,8 +140,8 @@ HTMLDOCS3={- join(", ", map { "-\n\t".$_ } @{$unified_info{htmldocs}->{man3}}) - HTMLDOCS5={- join(", ", map { "-\n\t".$_ } @{$unified_info{htmldocs}->{man5}}) -} HTMLDOCS7={- join(", ", map { "-\n\t".$_ } @{$unified_info{htmldocs}->{man7}}) -} -APPS_OPENSSL={- use File::Spec::Functions; - catfile("apps","openssl") -} +APPS_OPENSSL="{- use File::Spec::Functions; + catfile("apps","openssl") -}" # DESTDIR is for package builders so that they can configure for, say, # SYS$COMMON:[OPENSSL] and yet have everything installed in STAGING:[USER]. diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index ac24687609..a019779993 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -195,8 +195,8 @@ MANDOCS7={- fill_lines(" ", $COLUMNS - 9, map { platform->bin($_) } @{$unified_info{mandocs}->{man7}})) -} -APPS_OPENSSL={- use File::Spec::Functions; - catfile("apps","openssl") -} +APPS_OPENSSL="{- use File::Spec::Functions; + catfile("apps","openssl") -}" # DESTDIR is for package builders so that they can configure for, say, # /usr/ and yet have everything installed to /tmp/somedir/usr/. @@ -962,12 +962,6 @@ lint: generate_apps: ( cd $(SRCDIR); $(PERL) VMS/VMSify-conf.pl \ < apps/openssl.cnf > apps/openssl-vms.cnf ) - @ : {- output_off() if $disabled{apps}; "" -} - ( b=`pwd`; cd $(SRCDIR); \ - $(PERL) -I$$b apps/progs.pl -H $(APPS_OPENSSL) > apps/progs.h ) - ( b=`pwd`; cd $(SRCDIR); \ - $(PERL) -I$$b apps/progs.pl -C $(APPS_OPENSSL) > apps/progs.c ) - @ : {- output_on() if $disabled{apps}; "" -} generate_crypto_bn: ( cd $(SRCDIR); $(PERL) crypto/bn/bn_prime.pl > crypto/bn/bn_prime.h ) diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 859d3a6324..c49b32f0e1 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -130,8 +130,8 @@ HTMLDOCS5_BLDDIRS={- my %dirs = map { dirname($_) => 1 } @HTMLDOCS5; HTMLDOCS7_BLDDIRS={- my %dirs = map { dirname($_) => 1 } @HTMLDOCS7; join(' ', sort keys %dirs) -} -APPS_OPENSSL={- use File::Spec::Functions; - "\"".catfile("apps","openssl")."\"" -} +APPS_OPENSSL="{- use File::Spec::Functions; + catfile("apps","openssl") -}" # Do not edit these manually. Use Configure with --prefix or --openssldir # to change this! Short explanation in the top comment in Configure |