aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-03-03 07:28:29 -0800
committerMartin Jansa <Martin.Jansa@gmail.com>2021-03-04 10:27:14 +0100
commit36f4a9ccd15f5b12ba321f501306919427e42717 (patch)
treeb2d371861bdeb930c014fdde1e8cdb016c53dd18
parent5f0892c0e31b7874dd3de6616fee1bf2bd994ffe (diff)
qtdeclarative: Fix build with gcc11
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-yarr-Include-limits-for-numeric_limits.patch32
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0001-yarr-Include-limits-for-numeric_limits.patch b/recipes-qt/qt5/qtdeclarative/0001-yarr-Include-limits-for-numeric_limits.patch
new file mode 100644
index 00000000..1a77c04b
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative/0001-yarr-Include-limits-for-numeric_limits.patch
@@ -0,0 +1,32 @@
+From d99fda38487eee9a660101ce73c488680c485668 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 3 Mar 2021 07:26:21 -0800
+Subject: [PATCH] yarr: Include <limits> for numeric_limits
+
+Fixes
+src/3rdparty/masm/yarr/Yarr.h:46:44: error: 'numeric_limits' is not a member of 'std'
+ 46 | static const unsigned offsetNoMatch = std::numeric_limits<unsigned>::max();
+ | ^~~~~~~~~~~~~~
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/3rdparty/masm/yarr/Yarr.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/masm/yarr/Yarr.h b/src/3rdparty/masm/yarr/Yarr.h
+index ccf78f9880..cbb42c60d8 100644
+--- a/src/3rdparty/masm/yarr/Yarr.h
++++ b/src/3rdparty/masm/yarr/Yarr.h
+@@ -27,7 +27,7 @@
+
+ #pragma once
+
+-#include <limits.h>
++#include <limits>
+ #include "YarrErrorCode.h"
+
+ namespace JSC { namespace Yarr {
+--
+2.30.1
+
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index cadc62cb..05f6327c 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -16,6 +16,7 @@ LIC_FILES_CHKSUM = " \
# 5.15.meta-qt5.1
SRC_URI += " \
file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \
+ file://0001-yarr-Include-limits-for-numeric_limits.patch \
"
LDFLAGS_append_riscv64 = " -pthread"