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/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.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/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch deleted file mode 100644 index c0750a31..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch +++ /dev/null | |||
| @@ -1,47 +0,0 @@ | |||
| 1 | From 98af1531d71359612bbaa2a8619520ca4b6814bc Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 7 Jul 2017 16:41:23 -0700 | ||
| 4 | Subject: [PATCH] chromium: musl: Adjust default pthread stack size | ||
| 5 | |||
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 7 | --- | ||
| 8 | chromium/base/threading/platform_thread_linux.cc | 3 ++- | ||
| 9 | chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp | 4 ++-- | ||
| 10 | 2 files changed, 4 insertions(+), 3 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc | ||
| 13 | index 9917a7b1fd6..cb406659b90 100644 | ||
| 14 | --- a/chromium/base/threading/platform_thread_linux.cc | ||
| 15 | +++ b/chromium/base/threading/platform_thread_linux.cc | ||
| 16 | @@ -173,7 +173,8 @@ void TerminateOnThread() {} | ||
| 17 | |||
| 18 | size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { | ||
| 19 | #if !defined(THREAD_SANITIZER) | ||
| 20 | - return 0; | ||
| 21 | + // use 8mb like glibc to avoid running out of space | ||
| 22 | + return (1 << 23); | ||
| 23 | #else | ||
| 24 | // ThreadSanitizer bloats the stack heavily. Evidence has been that the | ||
| 25 | // default stack size isn't enough for some browser tests. | ||
| 26 | diff --git a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp | ||
| 27 | index 13c3f907f8e..07308e08351 100644 | ||
| 28 | --- a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp | ||
| 29 | +++ b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp | ||
| 30 | @@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() { | ||
| 31 | // FIXME: On Mac OSX and Linux, this method cannot estimate stack size | ||
| 32 | // correctly for the main thread. | ||
| 33 | |||
| 34 | -#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ | ||
| 35 | +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ | ||
| 36 | defined(OS_FUCHSIA) | ||
| 37 | // pthread_getattr_np() can fail if the thread is not invoked by | ||
| 38 | // pthread_create() (e.g., the main thread of webkit_unit_tests). | ||
| 39 | @@ -96,7 +96,7 @@ size_t GetUnderestimatedStackSize() { | ||
| 40 | } | ||
| 41 | |||
| 42 | void* GetStackStart() { | ||
| 43 | -#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ | ||
| 44 | +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ | ||
| 45 | defined(OS_FUCHSIA) | ||
| 46 | pthread_attr_t attr; | ||
| 47 | int error; | ||
