diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-11-26 16:07:49 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-11-27 07:38:23 +0200 |
| commit | 3bd81f1997683774dd28e6b8673c9b19b66a73ec (patch) | |
| tree | 368a37454e3d7031b33a609ef9a428fa43c73880 /recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | |
| parent | 08cc9ad2579f897b84d4fb430d898103dc568d26 (diff) | |
| parent | 929b2ef266c6eb4cc1f5500f421fda449cd8900b (diff) | |
| download | meta-qt5-3bd81f1997683774dd28e6b8673c9b19b66a73ec.tar.gz | |
Merge remote-tracking branch 'qt/5.14' into 5.15
* qt/5.14: (22 commits)
qtwebengine: add clang fix
qt5: update submodules
qt5: use PACKAGECONFIG to disable tests and examples
qt5: update submodules
qt5: update submodules
qt5: update submodules
qt5: update submodules
ogl-runtime: update to v2.5.0 release
qttools: don't install tst_qtattributionsscanner
qt5: Upgrade to Qt 5.13.2
python(3)-pyqt5: add qml support
libqofono: bump SRCREV and add a fix for voicecall
qt5: update submodules
qt5: update submodules
qtbase: add openssl PACKAGECONFIG for native nativesdk
ogl-runtime: update to 2.5
qtbase: Add PACKAGECONFIG for lttng
layer: Mark zeus as compatible release
ogl-runtime: Fix build on x86_64
README.md: Document need for 32bit host compiler
...
Change-Id: I3892eef7a2ee02cde0f493df7aa1a27f683f1799
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 | |||