blob: 864d0baa2a83654e7b0a7d59b865b11703b7f219 [file] [log] [blame]
Andrew Geisslerd159c7f2021-09-02 21:05:58 -05001From 632670273cc880917e78a152a3ae39e209b57864 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?=
3 <zboszor@gmail.com>
4Date: Sat, 28 Aug 2021 05:58:25 +0200
5Subject: [PATCH] fix build with --disable-dependency-tracking
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10With split build and source directories AND --disable-dependency-tracking
11(like the way Yocto builds are done) there's a reproducible make
12failure on my Fedora 33 build host:
13
14| Making all in src
15| make[2]: Entering directory '.../metacity/1_3.40.0-r0/build/src'
16| .../metacity/1_3.40.0-r0/recipe-sysroot-native/usr/bin/glib-mkenums --template ../../metacity-3.40.0/src/core/meta-enum-types.c.in ../../metacity-3.40.0/src/core/window-private.h ../../metacity-3.40.0/src/include/meta-compositor.h > \
17| meta-enum-types.c.tmp && mv meta-enum-types.c.tmp core/meta-enum-types.c
18| .../metacity/1_3.40.0-r0/recipe-sysroot-native/usr/bin/glib-mkenums --template ../../metacity-3.40.0/src/core/meta-enum-types.h.in ../../metacity-3.40.0/src/core/window-private.h ../../metacity-3.40.0/src/include/meta-compositor.h > \
19| meta-enum-types.h.tmp && mv meta-enum-types.h.tmp core/meta-enum-types.h
20| mv: cannot move 'meta-enum-types.c.tmp' to 'core/meta-enum-types.c'mv: cannot move 'meta-enum-types.h.tmp' to 'core/meta-enum-types.h': No such file or directory
21| : No such file or directory
22| make[2]: *** [Makefile:2240: core/meta-enum-types.c] Error 1
23
24https://gitlab.gnome.org/GNOME/metacity/-/merge_requests/24
25
26Upstream-Status: Pending
27
28Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
29---
30 configure.ac | 1 +
31 src/Makefile.am | 2 ++
32 2 files changed, 3 insertions(+)
33
34diff --git a/configure.ac b/configure.ac
35index ebb00b85..04aafb94 100644
36--- a/configure.ac
37+++ b/configure.ac
38@@ -139,6 +139,7 @@ dnl **************************************************************************
39 AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
40
41 AC_PROG_CC
42+AC_PROG_MKDIR_P
43 AC_ISC_POSIX
44 AC_HEADER_STDC
45
46diff --git a/src/Makefile.am b/src/Makefile.am
47index f86af600..4aa3fdae 100644
48--- a/src/Makefile.am
49+++ b/src/Makefile.am
50@@ -204,10 +204,12 @@ ENUM_TYPES = \
51 $(NULL)
52
53 core/meta-enum-types.c: core/meta-enum-types.c.in $(ENUM_TYPES) Makefile.am
54+ $(MKDIR_P) core
55 $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/core/meta-enum-types.c.in $(ENUM_TYPES) > \
56 meta-enum-types.c.tmp && mv meta-enum-types.c.tmp core/meta-enum-types.c
57
58 core/meta-enum-types.h: core/meta-enum-types.h.in $(ENUM_TYPES) Makefile.am
59+ $(MKDIR_P) core
60 $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/core/meta-enum-types.h.in $(ENUM_TYPES) > \
61 meta-enum-types.h.tmp && mv meta-enum-types.h.tmp core/meta-enum-types.h
62
63--
642.31.1
65