diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-24 08:43:50 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-24 08:43:51 +0000 |
| commit | 51e07805e0cf8f53bc9609854d1afd5e51494151 (patch) | |
| tree | b76b4ff591d489b33886044dd67a94852c74ea3b /recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch | |
| parent | c67abd66ff15feeaae5acc2688b932e5dec72317 (diff) | |
qtbase: replace the fix for gcc-4.8 with the one from upstreamupstream/jansa/master-5.12
* fixes:
| In file included from ../include/QtCore/qendian.h:1:0,
| from /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+13ed06640c-r0/git/src/corelib/codecs/qutfcodec.cpp:43:
| ../include/QtCore/../../../git/src/corelib/global/qendian.h: In instantiation of �constexpr Float qbswapFloatHelper(Float) [with Float = qfloat16]�:
| ../include/QtCore/../../../git/src/corelib/global/qendian.h:167:36: required from here
| ../include/QtCore/../../../git/src/corelib/global/qendian.h:163:1: error: body of constexpr function �constexpr Float qbswapFloatHelper(Float) [with Float = qfloat16]� not a return-statement
| }
| ^
| ../include/QtCore/../../../git/src/corelib/global/qendian.h: In instantiation of �constexpr Float qbswapFloatHelper(Float) [with Float = float]�:
| ../include/QtCore/../../../git/src/corelib/global/qendian.h:172:29: required from here
| ../include/QtCore/../../../git/src/corelib/global/qendian.h:163:1: error: body of constexpr function �constexpr Float qbswapFloatHelper(Float) [with Float = float]� not a return-statement
| ../include/QtCore/../../../git/src/corelib/global/qendian.h: In instantiation of �constexpr Float qbswapFloatHelper(Float) [with Float = double]�:
| ../include/QtCore/../../../git/src/corelib/global/qendian.h:177:29: required from here
| ../include/QtCore/../../../git/src/corelib/global/qendian.h:163:1: error: body of constexpr function �constexpr Float qbswapFloatHelper(Float) [with Float = double]� not a return-statement
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch index 6ac54fdf..733e69ac 100644 --- a/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch @@ -1,4 +1,4 @@ -From f21492a98b2a738e53134be8b7bf8ce44af71712 Mon Sep 17 00:00:00 2001 +From 4d5e38f1b5f42d61428b7984f9f4d7f22ebe2a2e Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Fri, 24 Nov 2017 15:16:31 +0200 Subject: [PATCH] Bootstrap without linkat feature |