summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 @@
1From d99fda38487eee9a660101ce73c488680c485668 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 3 Mar 2021 07:26:21 -0800
4Subject: [PATCH] yarr: Include <limits> for numeric_limits
5
6Fixes
7src/3rdparty/masm/yarr/Yarr.h:46:44: error: 'numeric_limits' is not a member of 'std'
8 46 | static const unsigned offsetNoMatch = std::numeric_limits<unsigned>::max();
9 | ^~~~~~~~~~~~~~
10
11Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 src/3rdparty/masm/yarr/Yarr.h | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/src/3rdparty/masm/yarr/Yarr.h b/src/3rdparty/masm/yarr/Yarr.h
18index ccf78f9880..cbb42c60d8 100644
19--- a/src/3rdparty/masm/yarr/Yarr.h
20+++ b/src/3rdparty/masm/yarr/Yarr.h
21@@ -27,7 +27,7 @@
22
23 #pragma once
24
25-#include <limits.h>
26+#include <limits>
27 #include "YarrErrorCode.h"
28
29 namespace JSC { namespace Yarr {
30--
312.30.1
32
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 = " \
16# 5.15.meta-qt5.1 16# 5.15.meta-qt5.1
17SRC_URI += " \ 17SRC_URI += " \
18 file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \ 18 file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \
19 file://0001-yarr-Include-limits-for-numeric_limits.patch \
19" 20"
20 21
21LDFLAGS_append_riscv64 = " -pthread" 22LDFLAGS_append_riscv64 = " -pthread"