diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-10-23 15:55:46 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-10-30 08:11:51 +0000 |
commit | bfddeb7f34db5b1d1b73a787246ca28f8ad3575b (patch) | |
tree | ad8d7e0e85bbf25772fe0a3d35e8c0045e23f336 /recipes-qt/qt5/qtwebengine_git.bb | |
parent | 11b63656bad9db24950d05901a8b1917bc5cb7f8 (diff) | |
download | meta-qt5-bfddeb7f34db5b1d1b73a787246ca28f8ad3575b.tar.gz |
qtwebengine: update chromium musl patchset
Change-Id: I792a600e354531f234a3ff641c030c119921f200
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index de606923..b4e0bd4d 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -111,7 +111,6 @@ do_configure_prepend_libc-musl() { | |||
111 | for f in `find ${S}/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/ -name config.h -o -name config.asm`; do | 111 | for f in `find ${S}/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/ -name config.h -o -name config.asm`; do |
112 | sed -i -e "s:define HAVE_SYSCTL 1:define HAVE_SYSCTL 0:g" $f | 112 | sed -i -e "s:define HAVE_SYSCTL 1:define HAVE_SYSCTL 0:g" $f |
113 | done | 113 | done |
114 | sed -i -e "s:define HAVE_STRUCT_MALLINFO 1:/*undef HAVE_STRUCT_MALLINFO */:g" ${S}/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/config_linux.h | ||
115 | } | 114 | } |
116 | 115 | ||
117 | do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+" | 116 | do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+" |
@@ -165,10 +164,8 @@ SRC_URI_append_libc-musl = "\ | |||
165 | file://chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ | 164 | file://chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ |
166 | file://chromium/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ | 165 | file://chromium/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ |
167 | file://chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ | 166 | file://chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ |
168 | file://chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ | ||
169 | file://chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ | 167 | file://chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ |
170 | file://chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ | 168 | file://chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ |
171 | file://chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ | ||
172 | file://chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch;patchdir=src/3rdparty \ | 169 | file://chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch;patchdir=src/3rdparty \ |
173 | file://chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch;patchdir=src/3rdparty \ | 170 | file://chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch;patchdir=src/3rdparty \ |
174 | " | 171 | " |