diff options
Diffstat (limited to 'meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch')
-rw-r--r-- | meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch b/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch index 29076bf6cb..8ca52ebde7 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch +++ b/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From e0f4b6d18ce6f025c78773e909b9c395ad833c7a Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Mon, 29 Jul 2019 08:38:32 +0800 | ||
4 | Subject: [PATCH] configure: fix dependencies | ||
5 | |||
1 | Many source files include e.g. wayland-protocols.h which should be found in the | 6 | Many source files include e.g. wayland-protocols.h which should be found in the |
2 | sysroot but SDL wants to build its own headers from the XML definitions. | 7 | sysroot but SDL wants to build its own headers from the XML definitions. |
3 | 8 | ||
@@ -14,34 +19,42 @@ the primary objects. | |||
14 | 19 | ||
15 | Upstream-Status: Pending | 20 | Upstream-Status: Pending |
16 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 21 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
22 | [Moved to configure.ac] | ||
23 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
24 | --- | ||
25 | configure.ac | 6 +++--- | ||
26 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
17 | 27 | ||
18 | diff --git a/configure.in b/data/poky-tmp/master/work/corei7-64-poky-linux/libsdl2/2.0.8-r0/SDL2-2.0.8/configure.in | 28 | diff --git a/configure.ac b/configure.ac |
19 | index 1c7e79338..ba07a4a4e 100644 | 29 | index 9e782c6..997915a 100644 |
20 | --- a/configure.in | 30 | --- a/configure.ac |
21 | +++ b/data/poky-tmp/master/work/corei7-64-poky-linux/libsdl2/2.0.8-r0/SDL2-2.0.8/configure.in | 31 | +++ b/configure.ac |
22 | @@ -4011,7 +4011,7 @@ DEPENDS=`echo $SOURCES | tr ' ' '\n'` | 32 | @@ -4061,7 +4061,7 @@ DEPENDS=`echo $SOURCES | tr ' ' '\n'` |
23 | for EXT in asm cc m c S; do | 33 | for EXT in asm cc m c S; do |
24 | OBJECTS=`echo "$OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.'$EXT',$(objects)/\1.lo,g'` | 34 | OBJECTS=`echo "$OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.'$EXT',$(objects)/\1.lo,g'` |
25 | DEPENDS=`echo "$DEPENDS" | sed "s,^\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.$EXT\\$,\\\\ | 35 | DEPENDS=`echo "$DEPENDS" | sed "s,^\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.$EXT\\$,\\\\ |
26 | -\\$(objects)/\\2.lo: \\1/\\2.$EXT\\\\ | 36 | -\\$(objects)/\\2.lo: \\1/\\2.$EXT \\$(objects)/.created\\\\ |
27 | +\\$(objects)/\\2.lo: \\1/\\2.$EXT \\$(GEN_OBJECTS)\\\\ | 37 | +\\$(objects)/\\2.lo: \\1/\\2.$EXT \\$(objects)/.created \\$(GEN_OBJECTS)\\\\ |
28 | \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` | 38 | \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` |
29 | done | 39 | done |
30 | 40 | ||
31 | @@ -4028,14 +4028,14 @@ SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` | 41 | @@ -4078,14 +4078,14 @@ SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` |
32 | SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES` | 42 | SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES` |
33 | SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` | 43 | SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` |
34 | SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ | 44 | SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ |
35 | -\\$(objects)/\\2.lo: \\1/\\2.c\\\\ | 45 | -\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created\\\\ |
36 | +\\$(objects)/\\2.lo: \\1/\\2.c \\$(GEN_OBJECTS)\\\\ | 46 | +\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created \\$(GEN_OBJECTS)\\\\ |
37 | \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` | 47 | \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` |
38 | 48 | ||
39 | SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES` | 49 | SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES` |
40 | SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES` | 50 | SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES` |
41 | SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` | 51 | SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` |
42 | SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ | 52 | SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ |
43 | -\\$(objects)/\\2.lo: \\1/\\2.c\\\\ | 53 | -\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created\\\\ |
44 | +\\$(objects)/\\2.lo: \\1/\\2.c\\\\ \\$(GEN_OBJECTS)\\\\ | 54 | +\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created \\$(GEN_OBJECTS)\\\\ |
45 | \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` | 55 | \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` |
46 | 56 | ||
47 | # Set runtime shared library paths as needed | 57 | # Set runtime shared library paths as needed |
58 | -- | ||
59 | 2.7.4 | ||
60 | |||