| Brad Bishop | 1d80a2e | 2019-11-15 16:35:03 -0500 | [diff] [blame^] | 1 | # HG changeset patch |
| 2 | # User Anuj Mittal <am.devel@gmail.com> |
| 3 | # Date 1573631462 -10800 |
| 4 | # Node ID 1fb1880d5edfc7c5a370846e13f90b260263627c |
| 5 | # Parent 007002587d5d34d781c2b628c05e992e0ac5f52d |
| 6 | configure: check for build dir when building version res (fix bug #4858) |
| 7 | Fixes a race where we try to build version res file in build directory |
| 8 | before it has even been created. Prevents errors like: |
| 9 | |
| 10 | /bin/bash ../SDL2-2.0.10/build-scripts/updaterev.sh |
| 11 | /bin/bash ../SDL2-2.0.10/build-scripts/mkinstalldirs build |
| 12 | mkdir -p -- build |
| 13 | 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 |
| 14 | x86_64-pokysdk-mingw32-windres: build/version.o: No such file or directory |
| 15 | Makefile:692: recipe for target 'build/version.o' failed |
| 16 | make: *** [build/version.o] Error 1 |
| 17 | make: *** Waiting for unfinished jobs.... |
| 18 | touch build/.created |
| 19 | WARNING: exit code 1 from a shell command. |
| 20 | |
| 21 | Extension of fix: |
| 22 | https://hg.libsdl.org/SDL/rev/99d8b18acf8a |
| 23 | |
| 24 | Upstream-Status: Backport |
| 25 | Signed-off-by: Anuj Mittal <am.devel@gmail.com> |
| 26 | --- |
| 27 | configure.ac | 2 +- |
| 28 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 29 | |
| 30 | diff -r 007002587d5d -r 1fb1880d5edf configure |
| 31 | --- a/configure Tue Nov 12 17:24:37 2019 -0500 |
| 32 | +++ b/configure Wed Nov 13 10:51:02 2019 +0300 |
| 33 | @@ -25493,7 +25493,7 @@ |
| 34 | VERSION_DEPENDS=`echo $VERSION_SOURCES` |
| 35 | VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[^ ]*/\([^ ]*\)\.rc,$(objects)/\1.o,g'` |
| 36 | VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([^ ]*\\)/\\([^ ]*\\)\\.rc,\\\\ |
| 37 | -\\$(objects)/\\2.o: \\1/\\2.rc\\\\ |
| 38 | +\\$(objects)/\\2.o: \\1/\\2.rc \\$(objects)/.created\\\\ |
| 39 | \\$(WINDRES) \\$< \\$@,g"` |
| 40 | |
| 41 | SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` |
| 42 | diff -r 007002587d5d -r 1fb1880d5edf configure.ac |
| 43 | --- a/configure.ac Tue Nov 12 17:24:37 2019 -0500 |
| 44 | +++ b/configure.ac Wed Nov 13 10:51:02 2019 +0300 |
| 45 | @@ -4177,7 +4177,7 @@ |
| 46 | VERSION_DEPENDS=`echo $VERSION_SOURCES` |
| 47 | VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'` |
| 48 | VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\ |
| 49 | -\\$(objects)/\\2.o: \\1/\\2.rc\\\\ |
| 50 | +\\$(objects)/\\2.o: \\1/\\2.rc \\$(objects)/.created\\\\ |
| 51 | \\$(WINDRES) \\$< \\$@,g"` |
| 52 | |
| 53 | SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` |