summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch')
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch60
1 files changed, 0 insertions, 60 deletions
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch b/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch
deleted file mode 100644
index 8ca52ebde7..0000000000
--- a/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1From e0f4b6d18ce6f025c78773e909b9c395ad833c7a Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Mon, 29 Jul 2019 08:38:32 +0800
4Subject: [PATCH] configure: fix dependencies
5
6Many source files include e.g. wayland-protocols.h which should be found in the
7sysroot but SDL wants to build its own headers from the XML definitions.
8
9However the rules to generate those headers are only dependencies of the
10top-level libSDL2.la object so can be built in parallel with the rest of the
11objects, which can lead to interesting errors if the header is parsed by the
12compiler whilst it's being written by another process:
13
14| gen/wayland-client-protocol.h:3: error: unterminated #ifndef
15| #ifndef WAYLAND_CLIENT_PROTOCOL_H
16
17Solve this by adding more dependencies so the generated files are built before
18the primary objects.
19
20Upstream-Status: Pending
21Signed-off-by: Ross Burton <ross.burton@intel.com>
22[Moved to configure.ac]
23Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
24---
25 configure.ac | 6 +++---
26 1 file changed, 3 insertions(+), 3 deletions(-)
27
28diff --git a/configure.ac b/configure.ac
29index 9e782c6..997915a 100644
30--- a/configure.ac
31+++ b/configure.ac
32@@ -4061,7 +4061,7 @@ DEPENDS=`echo $SOURCES | tr ' ' '\n'`
33 for EXT in asm cc m c S; do
34 OBJECTS=`echo "$OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.'$EXT',$(objects)/\1.lo,g'`
35 DEPENDS=`echo "$DEPENDS" | sed "s,^\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.$EXT\\$,\\\\
36-\\$(objects)/\\2.lo: \\1/\\2.$EXT \\$(objects)/.created\\\\
37+\\$(objects)/\\2.lo: \\1/\\2.$EXT \\$(objects)/.created \\$(GEN_OBJECTS)\\\\
38 \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
39 done
40
41@@ -4078,14 +4078,14 @@ SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
42 SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
43 SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
44 SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
45-\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created\\\\
46+\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created \\$(GEN_OBJECTS)\\\\
47 \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
48
49 SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
50 SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
51 SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
52 SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
53-\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created\\\\
54+\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created \\$(GEN_OBJECTS)\\\\
55 \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
56
57 # Set runtime shared library paths as needed
58--
592.7.4
60