| From e0f4b6d18ce6f025c78773e909b9c395ad833c7a Mon Sep 17 00:00:00 2001 |
| From: Ross Burton <ross.burton@intel.com> |
| Date: Mon, 29 Jul 2019 08:38:32 +0800 |
| Subject: [PATCH] configure: fix dependencies |
| |
| Many source files include e.g. wayland-protocols.h which should be found in the |
| sysroot but SDL wants to build its own headers from the XML definitions. |
| |
| However the rules to generate those headers are only dependencies of the |
| top-level libSDL2.la object so can be built in parallel with the rest of the |
| objects, which can lead to interesting errors if the header is parsed by the |
| compiler whilst it's being written by another process: |
| |
| | gen/wayland-client-protocol.h:3: error: unterminated #ifndef |
| | #ifndef WAYLAND_CLIENT_PROTOCOL_H |
| |
| Solve this by adding more dependencies so the generated files are built before |
| the primary objects. |
| |
| Upstream-Status: Pending |
| Signed-off-by: Ross Burton <ross.burton@intel.com> |
| [Moved to configure.ac] |
| Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
| --- |
| configure.ac | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/configure.ac b/configure.ac |
| index 9e782c6..997915a 100644 |
| --- a/configure.ac |
| +++ b/configure.ac |
| @@ -4061,7 +4061,7 @@ DEPENDS=`echo $SOURCES | tr ' ' '\n'` |
| for EXT in asm cc m c S; do |
| OBJECTS=`echo "$OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.'$EXT',$(objects)/\1.lo,g'` |
| DEPENDS=`echo "$DEPENDS" | sed "s,^\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.$EXT\\$,\\\\ |
| -\\$(objects)/\\2.lo: \\1/\\2.$EXT \\$(objects)/.created\\\\ |
| +\\$(objects)/\\2.lo: \\1/\\2.$EXT \\$(objects)/.created \\$(GEN_OBJECTS)\\\\ |
| \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` |
| done |
| |
| @@ -4078,14 +4078,14 @@ SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` |
| SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES` |
| SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` |
| SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ |
| -\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created\\\\ |
| +\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created \\$(GEN_OBJECTS)\\\\ |
| \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` |
| |
| SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES` |
| SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES` |
| SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` |
| SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ |
| -\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created\\\\ |
| +\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created \\$(GEN_OBJECTS)\\\\ |
| \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` |
| |
| # Set runtime shared library paths as needed |
| -- |
| 2.7.4 |
| |