From: Reuben Thomas <rrt@sc3d.org>
Date: Sat, 28 Nov 2020 02:02:08 +0000 (-0800)
Subject: vala: avoid wrong regeneration of C files.
X-Git-Tag: v1.16.4~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7581ec208302e37952cade631b82b0924451822c;p=thirdparty%2Fautomake.git

vala: avoid wrong regeneration of C files.

This change might fix https://bugs.gnu.org/44772.

* bin/automake.in (lang_val_finish_target): reverse -newer test
to handle files being created at the same time causing
spurious rebuilds.
---

diff --git a/bin/automake.in b/bin/automake.in
index 31c72382a..ce06437db 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -5734,7 +5734,7 @@ sub lang_vala_finish_target
           my $built_dir = dirname $built_c_file;
           my $base_c_file = basename $c_file;
           $output_rules .= "$built_c_file: \$(builddir)/${derived}_vala.stamp\n"
-            . "\t\@if test ! -f \$@ && test \$(srcdir) != \$(builddir) && test -n \"\$\$(find -L \$(srcdir)/$c_file -prune -newer \$(srcdir)/$vala_file)\"; then cp -p \$(srcdir)/$c_file $built_c_file; fi\n"
+            . "\t\@if test ! -f \$@ && test \$(srcdir) != \$(builddir) && test -n \"\$\$(find -L \$(srcdir)/$vala_file -prune \! -newer \$(srcdir)/$c_file)\"; then cp -p \$(srcdir)/$c_file $built_c_file; fi\n"
             . "\t\@if test -f \$@; then :; else rm -f \$(builddir)/${derived}_vala.stamp; fi\n"
             . "\t\@if test -f \$@; then :; else \\\n"
             . "\t  \$(MAKE) \$(AM_MAKEFLAGS) \$(builddir)/${derived}_vala.stamp; \\\n"