diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-06-15 19:31:01 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-06-15 19:53:31 +0200 |
| commit | 2ac7754a72b0488241463dbff1bd75b82081417a (patch) | |
| tree | e37bcd0812577966e3aa7d8f396c6a3e4fc85402 /Configurations | |
| parent | 85bbb9e6189e158647b1cb15c5c1dea32882240e (diff) | |
Build apps/progs.h dynamically
Because apps/progs.h isn't configuration agnostic, it's not at all
suited for 'make update' or being versioned, so change it to be
dynamically generated.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3688)
(cherry picked from commit 6a74806ed741db24df3a7155e4bc11fb4ba9bc2a)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 3 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 13 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 3 |
3 files changed, 9 insertions, 10 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index c4eb0a88aa..92898f9104 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -144,6 +144,9 @@ BIN_SCRIPTS=[.tools]c_rehash.pl MISC_SCRIPTS=[.apps]CA.pl, [.apps]tsget.pl {- output_on() if $disabled{apps}; "" -} +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]. # In that case, configure with --prefix=SYS$COMMON:[OPENSSL] and then run diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 2cc37cd25e..a56110b0d7 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -113,6 +113,9 @@ BIN_SCRIPTS=$(BLDDIR)/tools/c_rehash MISC_SCRIPTS=$(BLDDIR)/apps/CA.pl $(BLDDIR)/apps/tsget {- output_on() if $disabled{apps}; "" -} +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/. # Normally it is left empty. @@ -592,19 +595,9 @@ doc-nits: lint: lint -DLINT $(INCLUDES) $(SRCS) -{- # because the program apps/openssl has object files as sources, and - # they then have the corresponding C files as source, we need to chain - # the lookups in %unified_info - my $apps_openssl = catfile("apps","openssl"); - our @openssl_source = map { @{$unified_info{sources}->{$_}} } - @{$unified_info{sources}->{$apps_openssl}}; - ""; -} generate_apps: ( cd $(SRCDIR); $(PERL) VMS/VMSify-conf.pl \ < apps/openssl.cnf > apps/openssl-vms.cnf ) - ( b=`pwd`; cd $(SRCDIR); $(PERL) -I$$b apps/progs.pl \ - {- join(" ", @openssl_source) -} \ - > apps/progs.h ) 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 f7aa58a728..45bfecc387 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -100,6 +100,9 @@ BIN_SCRIPTS=$(BLDDIR)\tools\c_rehash.pl MISC_SCRIPTS=$(BLDDIR)\apps\CA.pl $(BLDDIR)\apps\tsget.pl {- output_on() if $disabled{apps}; "" -} +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 INSTALLTOP_dev={- # $prefix is used in the OPENSSLDIR perl snippet |