summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2021-06-16 10:49:31 +0200
committerMatt Caswell <matt@openssl.org>2021-06-16 14:51:40 +0100
commit079f8d36ff6c5720a2dcbb8cbf996f05005fffb5 (patch)
tree9e788edd8ada66c03ac76608c345756f2d39f548
parent3c121b986c51887c4f6ff662f36b1338fcf53e2a (diff)
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)
-rw-r--r--Configurations/descrip.mms.tmpl2
-rw-r--r--Configurations/unix-Makefile.tmpl2
-rw-r--r--Configurations/windows-makefile.tmpl2
3 files changed, 3 insertions, 3 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index bddff81075..2cf03d0214 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -1335,7 +1335,7 @@ EOF
"util", "dofile.pl")),
rel2abs($config{builddir}));
return <<"EOF";
-$script : $sources
+$script : $sources configdata.pm
\$(PERL) "-I\$(BLDDIR)" "-Mconfigdata" $dofile -
"-o$target{build_file}" $sources > $script
SET FILE/PROT=(S:RWED,O:RWED,G:RE,W:RE) $script
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index ff04e65163..553e51dfe5 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -1923,7 +1923,7 @@ EOF
"util", "dofile.pl")),
rel2abs($config{builddir}));
return <<"EOF";
-$script: $sources
+$script: $sources configdata.pm
\$(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 34b6c7878a..ce64c5c3c1 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -1007,7 +1007,7 @@ EOF
"util", "dofile.pl")),
rel2abs($config{builddir}));
return <<"EOF";
-$script: $sources
+$script: $sources configdata.pm
"\$(PERL)" "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\
"-o$target{build_file}" $sources > \$@
EOF