root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Build file templates: Fix in2script dependencies 

The in2script functions generates the build file rules for generating
scripts from .in files.  A dependency on configdata.pm is needed,
since it's being used for this.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15792)
This commit is contained in:
Richard Levitte 2021-06-16 10:49:31 +02:00 committed by Matt Caswell
parent 3c121b986c
commit 079f8d36ff
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configurations/descrip.mms.tmpl
View File

@ -1335,7 +1335,7 @@ EOF
"util", "dofile.pl")), "util", "dofile.pl")),
rel2abs($config{builddir})); rel2abs($config{builddir}));
return <<"EOF"; return <<"EOF";
$script : $sources $script : $sources configdata.pm
\$(PERL) "-I\$(BLDDIR)" "-Mconfigdata" $dofile - \$(PERL) "-I\$(BLDDIR)" "-Mconfigdata" $dofile -
"-o$target{build_file}" $sources > $script "-o$target{build_file}" $sources > $script
SET FILE/PROT=(S:RWED,O:RWED,G:RE,W:RE) $script SET FILE/PROT=(S:RWED,O:RWED,G:RE,W:RE) $script

2
Configurations/unix-Makefile.tmpl
View File

@ -1923,7 +1923,7 @@ EOF
"util", "dofile.pl")), "util", "dofile.pl")),
rel2abs($config{builddir})); rel2abs($config{builddir}));
return <<"EOF"; return <<"EOF";
$script: $sources $script: $sources configdata.pm
\$(PERL) "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\ \$(PERL) "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\
"-o$target{build_file}" $sources > "$script" "-o$target{build_file}" $sources > "$script"
chmod a+x $script chmod a+x $script

2
Configurations/windows-makefile.tmpl
View File

@ -1007,7 +1007,7 @@ EOF
"util", "dofile.pl")), "util", "dofile.pl")),
rel2abs($config{builddir})); rel2abs($config{builddir}));
return <<"EOF"; return <<"EOF";
$script: $sources $script: $sources configdata.pm
"\$(PERL)" "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\ "\$(PERL)" "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\
"-o$target{build_file}" $sources > \$@ "-o$target{build_file}" $sources > \$@
EOF EOF