Commit 8bd3398020cbdac06832f438d367630b44714fc0
2019-11-13T10:51:02
configure: check for build dir when building version res (fix bug #4858) Fixes a race where we try to build version res file in build directory before it has even been created. Prevents errors like: /bin/bash ../SDL2-2.0.10/build-scripts/updaterev.sh /bin/bash ../SDL2-2.0.10/build-scripts/mkinstalldirs build mkdir -p -- build x86_64-pokysdk-mingw32-windres --include-dir=/home/pokybuild/yocto-worker/meta-mingw/build/build/tmp/work/x86_64-nativesdk-mingw32-pokysdk-mingw32/nativesdk-libsdl2/2.0.10-r0/recipe-sysroot/opt/poky/3.0/sysroots/x86_64-pokysdk-mingw32/usr/include ../SDL2-2.0.10/src/main/windows/version.rc build/version.o x86_64-pokysdk-mingw32-windres: build/version.o: No such file or directory Makefile:692: recipe for target 'build/version.o' failed make: *** [build/version.o] Error 1 make: *** Waiting for unfinished jobs.... touch build/.created WARNING: exit code 1 from a shell command. Extension of fix: https://hg.libsdl.org/SDL/rev/bb65ba8e039b Signed-off-by: Anuj Mittal <am.devel@gmail.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index d1f356d..a4f7b74 100755
--- a/configure
+++ b/configure
@@ -25493,7 +25493,7 @@ VERSION_OBJECTS=`echo $VERSION_SOURCES`
VERSION_DEPENDS=`echo $VERSION_SOURCES`
VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[^ ]*/\([^ ]*\)\.rc,$(objects)/\1.o,g'`
VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([^ ]*\\)/\\([^ ]*\\)\\.rc,\\\\
-\\$(objects)/\\2.o: \\1/\\2.rc\\\\
+\\$(objects)/\\2.o: \\1/\\2.rc \\$(objects)/.created\\\\
\\$(WINDRES) \\$< \\$@,g"`
SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
diff --git a/configure.ac b/configure.ac
index 1aea11f..186229a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4177,7 +4177,7 @@ VERSION_OBJECTS=`echo $VERSION_SOURCES`
VERSION_DEPENDS=`echo $VERSION_SOURCES`
VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\
-\\$(objects)/\\2.o: \\1/\\2.rc\\\\
+\\$(objects)/\\2.o: \\1/\\2.rc \\$(objects)/.created\\\\
\\$(WINDRES) \\$< \\$@,g"`
SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`