patch 9.2.0013: parallel make invocation may break Wayland header generation

Problem:  parallel make invocation may break Wayland header generation
Solution: Use single make target to generate Wayland protocol files.
          (Jan Palus)

$(WAYLAND_SRC) contains up to 4 files which, given right timing and
parallelization level, can spawn 4 independent `make` processes during
parallel build. Each process generates same set of files intermittently
leading to inconsistent results. Instead use one common target each
source file depends on.

fixes:  #19419
closes: #19420

Signed-off-by: Jan Palus <jpalus@fastmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/Makefile b/src/Makefile
index e76ee91d7815c091c6b08bba33958fd55e92d1ae..c0b7db75ff88ff749a22b6df6aaf641dbe89dc11 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1607,7 +1607,10 @@ EXTRA_SRC = if_lua.c if_mzsch.c auto/if_perl.c \
            gui_beval.c netbeans.c job.c channel.c \
            $(GRESOURCE_SRC)
 
-$(WAYLAND_SRC):
+$(WAYLAND_SRC): genwaylandproto
+
+.PHONY: genwaylandproto
+genwaylandproto:
        cd auto/wayland; $(MAKE)
 
 # Needed for parallel jobs to work

diff --git a/src/version.c b/src/version.c
index fad148040442d787f634a309223e72d79e0a15a8..3add220987c377f3a6763644150c9ff413fa5f67 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    13,
 /**/
     12,
 /**/