summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2019-11-13 16:41:06 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-14 13:21:00 +0000
commit9ef69fddcbb9ee5f9cfeb4557427605cfbcdc00b (patch)
tree5aa0924777123b0ff5d42bb4b51fab1784550cad /meta/recipes-graphics
parentbf12fa8a48b4aefdfb430467560bdc17e0fbad69 (diff)
downloadpoky-9ef69fddcbb9ee5f9cfeb4557427605cfbcdc00b.tar.gz
libsdl2: fix race when building in parallel
Fixes a race where it tries to build version res file in build directory before it has even been created. Prevents intermittent errors on autobuilder when building for mingw: | /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/us | /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. (From OE-Core rev: 1cb3c64b70e0b16aabd2fe9cd6012564165ac476) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2/0001-configure-check-for-build-dir-when-building-version-.patch53
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb1
2 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0001-configure-check-for-build-dir-when-building-version-.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-configure-check-for-build-dir-when-building-version-.patch
new file mode 100644
index 0000000000..b383bd6548
--- /dev/null
+++ b/meta/recipes-graphics/libsdl2/libsdl2/0001-configure-check-for-build-dir-when-building-version-.patch
@@ -0,0 +1,53 @@
1# HG changeset patch
2# User Anuj Mittal <am.devel@gmail.com>
3# Date 1573631462 -10800
4# Node ID 1fb1880d5edfc7c5a370846e13f90b260263627c
5# Parent 007002587d5d34d781c2b628c05e992e0ac5f52d
6configure: check for build dir when building version res (fix bug #4858)
7Fixes a race where we try to build version res file in build directory
8before 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
12mkdir -p -- build
13x86_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
14x86_64-pokysdk-mingw32-windres: build/version.o: No such file or directory
15Makefile:692: recipe for target 'build/version.o' failed
16make: *** [build/version.o] Error 1
17make: *** Waiting for unfinished jobs....
18touch build/.created
19WARNING: exit code 1 from a shell command.
20
21Extension of fix:
22https://hg.libsdl.org/SDL/rev/99d8b18acf8a
23
24Upstream-Status: Backport
25Signed-off-by: Anuj Mittal <am.devel@gmail.com>
26---
27 configure.ac | 2 +-
28 1 file changed, 1 insertion(+), 1 deletion(-)
29
30diff -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`
42diff -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`
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
index 862abe1d54..ac4a356043 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
@@ -16,6 +16,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
16 file://more-gen-depends.patch \ 16 file://more-gen-depends.patch \
17 file://0001-Fixed-bug-4538-validate-image-size-when-loading-BMP-.patch \ 17 file://0001-Fixed-bug-4538-validate-image-size-when-loading-BMP-.patch \
18 file://0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch \ 18 file://0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch \
19 file://0001-configure-check-for-build-dir-when-building-version-.patch \
19" 20"
20 21
21S = "${WORKDIR}/SDL2-${PV}" 22S = "${WORKDIR}/SDL2-${PV}"