diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-18 15:44:26 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-18 15:45:10 +0200 |
commit | 12cc756c7948a90367473f0a52dd2fe2b519dd24 (patch) | |
tree | 5db143dfa7dbee5459cf4079d2e72cdf50c68d79 /recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | |
parent | 3e502778ee161bef4177e7e7f45c0c9b78d047da (diff) | |
parent | 432ad2aa6c3a13253fefc909faba368851d21fb1 (diff) | |
download | meta-qt5-12cc756c7948a90367473f0a52dd2fe2b519dd24.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.135.13
* qtyocto/upstream/zeus:
432ad2a qttools: don't install tst_qtattributionsscanner
8115617 qt5: Upgrade to Qt 5.13.2
267e646 python(3)-pyqt5: add qml support
653e12f libqofono: bump SRCREV and add a fix for voicecall
cefb48e qtbase: Add PACKAGECONFIG for lttng
911b346 layer: Mark zeus as compatible release
c373272 ogl-runtime: Fix build on x86_64
9172ba1 README.md: Document need for 32bit host compiler
db2fd6c qtwayland: Fix build with clang/libc++
6b5122e qtbase: Fix build when fp16 is used
Conflicts:
recipes-qt/qt5/ogl-runtime_git.bb
recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtwayland_git.bb
Change-Id: I6f325e5d4fc0f2e774962f1b5fd54e5e0e9c96d7
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch new file mode 100644 index 00000000..e03df6f4 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From be5e6f573faedf13d6f327bd168a3d90e840a3ae Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jul 2017 14:01:12 -0700 | ||
4 | Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not | ||
5 | defined | ||
6 | |||
7 | Musl does not define this Macro | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | chromium/sandbox/linux/suid/sandbox.c | 9 +++++++++ | ||
12 | 1 file changed, 9 insertions(+) | ||
13 | |||
14 | diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c | ||
15 | index 854819bfbb4..a99d32741d0 100644 | ||
16 | --- a/chromium/sandbox/linux/suid/sandbox.c | ||
17 | +++ b/chromium/sandbox/linux/suid/sandbox.c | ||
18 | @@ -46,6 +46,15 @@ static bool DropRoot(); | ||
19 | |||
20 | #define HANDLE_EINTR(x) TEMP_FAILURE_RETRY(x) | ||
21 | |||
22 | +#ifndef TEMP_FAILURE_RETRY | ||
23 | +# define TEMP_FAILURE_RETRY(expression) \ | ||
24 | + (__extension__ \ | ||
25 | + ({ long int __result; \ | ||
26 | + do __result = (long int) (expression); \ | ||
27 | + while (__result == -1L && errno == EINTR); \ | ||
28 | + __result; })) | ||
29 | +#endif | ||
30 | + | ||
31 | static void FatalError(const char* msg, ...) | ||
32 | __attribute__((noreturn, format(printf, 1, 2))); | ||
33 | |||