diff options
Diffstat (limited to 'meta/recipes-graphics/libsdl2')
-rw-r--r-- | meta/recipes-graphics/libsdl2/libsdl2/0001-Disable-libunwind-in-native-OE-builds-by-not-looking.patch | 38 | ||||
-rw-r--r-- | meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0001-Disable-libunwind-in-native-OE-builds-by-not-looking.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-Disable-libunwind-in-native-OE-builds-by-not-looking.patch new file mode 100644 index 0000000000..214664f621 --- /dev/null +++ b/meta/recipes-graphics/libsdl2/libsdl2/0001-Disable-libunwind-in-native-OE-builds-by-not-looking.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 50c691e83f81b235bb96ef996dd4568ffaae256f Mon Sep 17 00:00:00 2001 | ||
2 | From: Carlos Rafael Giani <crg7475@mailbox.org> | ||
3 | Date: Fri, 18 Mar 2022 12:06:23 +0100 | ||
4 | Subject: [PATCH] Disable libunwind in native OE builds by not looking for | ||
5 | libunwind | ||
6 | |||
7 | This is a workaround for this build error: | ||
8 | |||
9 | | -- Checking for one of the modules 'libunwind' | ||
10 | | CMake Error at [...]/build/tmp/work/x86_64-linux/libsdl2-native/2.0.20-r0/recipe-sysroot-native/usr/share/cmake-3.22/Modules/FindPkgConfig.cmake:890 (message): | ||
11 | | None of the required 'libunwind' found | ||
12 | | Call Stack (most recent call first): | ||
13 | | CMakeLists.txt:1367 (pkg_search_module) | ||
14 | |||
15 | By not looking for the libunwind header, the rest of the libunwind | ||
16 | specific bits in the CMake build script are disabled. | ||
17 | |||
18 | Upstream-Status: Inappropriate [OE specific] | ||
19 | --- | ||
20 | CMakeLists.txt | 2 +- | ||
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
24 | index 64f9fbf..12a4d8f 100644 | ||
25 | --- a/CMakeLists.txt | ||
26 | +++ b/CMakeLists.txt | ||
27 | @@ -862,7 +862,7 @@ if(SDL_LIBC) | ||
28 | check_include_file(sys/types.h HAVE_SYS_TYPES_H) | ||
29 | foreach(_HEADER | ||
30 | stdio.h stdlib.h stddef.h stdarg.h malloc.h memory.h string.h limits.h float.h | ||
31 | - strings.h wchar.h inttypes.h stdint.h ctype.h math.h iconv.h signal.h libunwind.h) | ||
32 | + strings.h wchar.h inttypes.h stdint.h ctype.h math.h iconv.h signal.h) | ||
33 | string(TOUPPER "HAVE_${_HEADER}" _UPPER) | ||
34 | string(REPLACE "." "_" _HAVE_H ${_UPPER}) | ||
35 | check_include_file("${_HEADER}" ${_HAVE_H}) | ||
36 | -- | ||
37 | 2.32.0 | ||
38 | |||
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb index 58bc94cc86..4ba22c1fe6 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb | |||
@@ -20,6 +20,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ | |||
20 | file://optional-libunwind-generic.patch \ | 20 | file://optional-libunwind-generic.patch \ |
21 | file://0001-sdlchecks.cmake-pass-cflags-to-the-appropriate-cmake.patch \ | 21 | file://0001-sdlchecks.cmake-pass-cflags-to-the-appropriate-cmake.patch \ |
22 | " | 22 | " |
23 | SRC_URI:append:class-native = " file://0001-Disable-libunwind-in-native-OE-builds-by-not-looking.patch" | ||
23 | 24 | ||
24 | S = "${WORKDIR}/SDL2-${PV}" | 25 | S = "${WORKDIR}/SDL2-${PV}" |
25 | 26 | ||