diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-20 01:05:55 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-21 21:01:40 +0000 |
commit | c8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0 (patch) | |
tree | 821445c6e1fe46948cd9fba26480ed359288b545 /recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch | |
parent | c6be23d3b01b046d2142bb6fc017078f6154ddb5 (diff) | |
download | meta-qt5-c8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0.tar.gz |
qt5: upgrade to latest revision in 5.12
* WIP
* zlib temporarily disabled in qtbase-native, the configure fails too
find it even when it is in RSS:
docker-shr qemux86-64@ ~/build/oe-core $ find /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0 -name zlib\*
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/freetype/src/gzip/zlib.h
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib.pri
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib/src/zlib.h
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib_dependency.pri
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/lib/pkgconfig/zlib.pc
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/include/zlib.h
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/sysroot-providers/zlib-native
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.2dcdd26b684916aff89d13cb1c919939
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.complete
ERROR: Feature 'system-zlib' was enabled, but the pre-condition 'libs.zlib' failed.
* fixes #136
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch')
-rw-r--r-- | recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch b/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch new file mode 100644 index 00000000..287983c6 --- /dev/null +++ b/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From e60c7bff6556d9c36952de525a85c479a30f0030 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 23 Aug 2018 02:58:14 +0000 | ||
4 | Subject: [PATCH] Include asm/sgidefs.h on non-glibc systems | ||
5 | |||
6 | sgidefs.h wrapper is glibc specific and causes build | ||
7 | failures on musl | ||
8 | |||
9 | Fixes | ||
10 | Platform.h:380:10: fatal error: sgidefs.h: No such file or directory | ||
11 | #include <sgidefs.h> | ||
12 | ^~~~~~~~~~~ | ||
13 | compilation terminated. | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 4 ++++ | ||
19 | 1 file changed, 4 insertions(+) | ||
20 | |||
21 | diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | ||
22 | index 96942c7..f828f04 100644 | ||
23 | --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | ||
24 | +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | ||
25 | @@ -377,7 +377,11 @@ | ||
26 | |||
27 | #if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) | ||
28 | #define WTF_CPU_MIPS 1 | ||
29 | +#if defined(__GLIBC__) | ||
30 | #include <sgidefs.h> | ||
31 | +#else | ||
32 | +#include <asm/sgidefs.h> | ||
33 | +#endif | ||
34 | #if defined(__MIPSEB__) | ||
35 | #define WTF_CPU_BIG_ENDIAN 1 | ||
36 | #endif | ||