Build file templates: Fix in2script dependencies
authorRichard Levitte <levitte@openssl.org>
Wed, 16 Jun 2021 08:49:31 +0000 (10:49 +0200)
committerMatt Caswell <matt@openssl.org>
Wed, 16 Jun 2021 13:51:40 +0000 (14:51 +0100)
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)

Configurations/descrip.mms.tmpl
Configurations/unix-Makefile.tmpl
Configurations/windows-makefile.tmpl

index bddff81075b9002cf9f0d42e4f4e36eb1607ba8f..2cf03d0214dc080ae2d1351736f4ae491c167329 100644 (file)
@@ -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
index ff04e651632c86c644287d7f6c25e98f1844596b..553e51dfe5e01292ad12397b57c5376018bd5c80 100644 (file)
@@ -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
index 34b6c7878a526efcd25dd4a0f9b173c306d832e7..ce64c5c3c1940afc39b48026b210b6c31cd69357 100644 (file)
@@ -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