summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-native_git.bb
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@wdc.com>2018-06-22 12:41:25 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2018-06-25 14:30:57 +0000
commit40054db1de152d85c22aefdae50b136ca56967c5 (patch)
treef68ced3fd5ace5a6cc7723da4abf336e6cf3c89f /recipes-qt/qt5/qtbase-native_git.bb
parentdd1ce3c95ce3613df51bb9585fe1b73e8c96480a (diff)
downloadmeta-qt5-40054db1de152d85c22aefdae50b136ca56967c5.tar.gz
qt5: qtbase: Upgrade Double-Conversion
Backport the Double-Conversion upgrade from the dev branch (https://codereview.qt-project.org/#/c/227718/) to the current release. This fixes the RISC-V compile of QTBase. Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-native_git.bb')
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb9
1 files changed, 5 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 2ec36002..819f4473 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -19,7 +19,7 @@ require qt5-git.inc
19 19
20# common for qtbase-native, qtbase-nativesdk and qtbase 20# common for qtbase-native, qtbase-nativesdk and qtbase
21# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared 21# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared
22# 5.11.meta-qt5-shared.5 22# 5.11.meta-qt5-shared.6
23SRC_URI += "\ 23SRC_URI += "\
24 file://0001-Add-linux-oe-g-platform.patch \ 24 file://0001-Add-linux-oe-g-platform.patch \
25 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ 25 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -33,18 +33,19 @@ SRC_URI += "\
33 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ 33 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
34 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ 34 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
35 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ 35 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
36 file://0013-Upgrade-double-conversion-to-v3.0.0.patch \
36" 37"
37 38
38# common for qtbase-native and nativesdk-qtbase 39# common for qtbase-native and nativesdk-qtbase
39# Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native 40# Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native
40# 5.11.meta-qt5-native.5 41# 5.11.meta-qt5-native.6
41SRC_URI += " \ 42SRC_URI += " \
42 file://0013-Always-build-uic-and-qvkgen.patch \ 43 file://0014-Always-build-uic-and-qvkgen.patch \
43" 44"
44 45
45# only for qtbase-native 46# only for qtbase-native
46SRC_URI += " \ 47SRC_URI += " \
47 file://0014-Bootstrap-without-linkat-feature.patch \ 48 file://0015-Bootstrap-without-linkat-feature.patch \
48" 49"
49 50
50CLEANBROKEN = "1" 51CLEANBROKEN = "1"