diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-06-16 10:32:43 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-06-18 09:08:16 +0200 |
| commit | 0eed845ce2d76a1f2d8882cb32e1d36c30236d5e (patch) | |
| tree | 5a15eaa71eb973fabbd43b57f3576aa2e1bc7ad2 /Configurations | |
| parent | 1abcd1e858ea4b1e924bdd8141d55b889cc2fbc2 (diff) | |
| download | openssl-new-0eed845ce2d76a1f2d8882cb32e1d36c30236d5e.tar.gz | |
Make util/wrap.pl work better on VMS
Perl's system() on VMS needs to have the command line properly fixed
up, even with arguments passed in list form. We arrange that by
having util/wrap.pl use the same command line fixups as OpenSSL::Test.
As a consequence, util/wrap.pl needs to be generated, to easily pick
up data from configdata.pm. This also removes yet another file
copying hack from the build file templates.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15791)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 14 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 6 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 6 |
3 files changed, 6 insertions, 20 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 2cf03d0214..bad8e0a776 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -447,7 +447,7 @@ NODEBUG=@ # The main targets ################################################### -{- dependmagic('build_sw'); -} : build_libs_nodep, build_modules_nodep, build_programs_nodep copy-utils +{- dependmagic('build_sw'); -} : build_libs_nodep, build_modules_nodep, build_programs_nodep {- dependmagic('build_libs'); -} : build_libs_nodep {- dependmagic('build_modules'); -} : build_modules_nodep {- dependmagic('build_programs'); -} : build_programs_nodep @@ -476,7 +476,7 @@ build_all_generated : $(GENERATED_MANDATORY) $(GENERATED) build_docs all : build_sw build_docs test : tests -{- dependmagic('tests'); -} : build_programs_nodep, build_modules_nodep copy-utils run_tests +{- dependmagic('tests'); -} : build_programs_nodep, build_modules_nodep run_tests run_tests : @ ! {- output_off() if $disabled{tests}; "" -} DEFINE SRCTOP "$(SRCDIR)" @@ -738,16 +738,6 @@ check_INSTALLTOP : @ IF "$(INSTALLTOP)" .EQS. "" THEN - EXIT %x10000002 -# Helper targets ##################################################### - -copy-utils : [.util]wrap.pl - -[.util]wrap.pl : configdata.pm - @ IF "$(SRCDIR)" .NES. "$(BLDDIR)" THEN - - CREATE/DIR/LOG [.util] - @ IF "$(SRCDIR)" .NES. "$(BLDDIR)" THEN - - COPY/LOG ossl_sourceroot:[util]wrap.pl [.util] - # Developer targets ################################################## debug_logicals : diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 553e51dfe5..2b894c0928 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -1361,10 +1361,9 @@ tar: # Helper targets ##################################################### -link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/wrap.pl \ - $(BLDDIR)/apps/openssl.cnf +link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/apps/openssl.cnf -$(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/wrap.pl: configdata.pm +$(BLDDIR)/util/opensslwrap.sh: configdata.pm @if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \ mkdir -p "$(BLDDIR)/util"; \ ln -sf "../$(SRCDIR)/util/`basename "$@"`" "$(BLDDIR)/util"; \ @@ -1924,6 +1923,7 @@ EOF rel2abs($config{builddir})); return <<"EOF"; $script: $sources configdata.pm + \$(RM) "$script" \$(PERL) "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\ "-o$target{build_file}" $sources > "$script" chmod a+x $script diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index ce64c5c3c1..43b29baab4 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -641,11 +641,7 @@ uninstall_image_docs: # Helper targets ##################################################### -copy-utils: $(BLDDIR)\util\wrap.pl $(BLDDIR)\apps\openssl.cnf - -$(BLDDIR)\util\wrap.pl: configdata.pm - @if NOT EXIST "$(BLDDIR)\util" mkdir "$(BLDDIR)\util" - @if NOT "$(SRCDIR)"=="$(BLDDIR)" copy "$(SRCDIR)\util\$(@F)" "$(BLDDIR)\util" +copy-utils: $(BLDDIR)\apps\openssl.cnf $(BLDDIR)\apps\openssl.cnf: configdata.pm @if NOT EXIST "$(BLDDIR)\apps" mkdir "$(BLDDIR)\apps" |