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/0009-chromium-musl-Do-not-define-__sbrk-on-musl.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/0009-chromium-musl-Do-not-define-__sbrk-on-musl.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-Do-not-define-__sbrk-on-musl.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-Do-not-define-__sbrk-on-musl.patch new file mode 100644 index 00000000..41e8c5e2 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-Do-not-define-__sbrk-on-musl.patch | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | From 100d52256a2b46154fd376276347d6998a146b68 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 7 Jul 2017 15:39:57 -0700 | ||
| 4 | Subject: [PATCH] chromium: musl: Do not define __sbrk on musl | ||
| 5 | |||
| 6 | musl libc does not have sbrk. on musl libc will only work when called with 0 as | ||
| 7 | argument, so we just let it out for now | ||
| 8 | |||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | --- | ||
| 11 | .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +- | ||
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | ||
| 15 | index 7486a05a272..610a10b659a 100755 | ||
| 16 | --- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | ||
| 17 | +++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | ||
| 18 | @@ -206,7 +206,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, | ||
| 19 | return result; | ||
| 20 | } | ||
| 21 | |||
| 22 | -#ifndef __UCLIBC__ | ||
| 23 | +#if !defined(__UCLIBC__) && defined(__GLIBC__) | ||
| 24 | // libc's version: | ||
| 25 | extern "C" void* __sbrk(intptr_t increment); | ||
| 26 | |||
