summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
diff options
context:
space:
mode:
authorJani Suonpera <jani.suonpera@qt.io>2021-01-27 09:21:29 +0200
committerJani Suonpera <jani.suonpera@qt.io>2021-02-05 14:56:55 +0200
commita73de388e628a67490cdd7734779d405740b7fa3 (patch)
treec6410cd0062df9dde1fd02b56232027b7f865815 /recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
parent7dfe6ec495c3e56e4fbfb1dba23291589c28f7a7 (diff)
downloadmeta-qt5-a73de388e628a67490cdd7734779d405740b7fa3.tar.gz
qt5: update submodules for LTS 5.15
- Webengine-chromium branch changed from 83-based to 87-based. - PACKAGECONFIGs protobuf and jsoncpp are removed because these configurations has been removed from src/buildtools/configure.json - DEPENDS nodejs-native added. This mandatory for chromium build. Task-number: QTBUG-90623 Change-Id: Ic933c88399422941114915afe5baa202850928f4 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
new file mode 100644
index 00000000..1caa4a67
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
@@ -0,0 +1,33 @@
1From 56486b901c7101c5b78b1282f5b81e80141f9b05 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:01:12 -0700
4Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not
5 defined
6
7Musl does not define this Macro
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 chromium/sandbox/linux/suid/sandbox.c | 9 +++++++++
12 1 file changed, 9 insertions(+)
13
14diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c
15index 5fdb4817af8..e5b9431daa0 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