summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2020-04-18 10:53:19 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-04-19 17:14:28 +0200
commit7604faa3feb0c89a93ec4c0de3b458d6a3bbedf5 (patch)
tree36534ac8e6b4b65b550cf6e7c644c6eb9979d2ab /patches
parent334d0a46229f4f839e0723d6577498135fa1019f (diff)
downloadptxdist-7604faa3feb0c89a93ec4c0de3b458d6a3bbedf5.tar.gz
ptxdist-7604faa3feb0c89a93ec4c0de3b458d6a3bbedf5.tar.xz
qt4: add patch to support gcc 9.x
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/qt-everywhere-opensource-src-4.8.7/0010-configure-handle-gcc-9.x.patch22
-rw-r--r--patches/qt-everywhere-opensource-src-4.8.7/series3
2 files changed, 24 insertions, 1 deletions
diff --git a/patches/qt-everywhere-opensource-src-4.8.7/0010-configure-handle-gcc-9.x.patch b/patches/qt-everywhere-opensource-src-4.8.7/0010-configure-handle-gcc-9.x.patch
new file mode 100644
index 000000000..cebdfe002
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-4.8.7/0010-configure-handle-gcc-9.x.patch
@@ -0,0 +1,22 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 18 Apr 2020 10:52:34 +0200
+Subject: [PATCH] configure: handle gcc 9.x
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index a8e6dc141eda..39c895b091f3 100755
+--- a/configure
++++ b/configure
+@@ -7734,7 +7734,7 @@ case "$XPLATFORM" in
+ *-g++*)
+ # Check gcc's version
+ case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+- 8*|7*|6*|5*|4*|3.4*)
++ 9*|8*|7*|6*|5*|4*|3.4*)
+ ;;
+ 3.3*)
+ canBuildWebKit="no"
diff --git a/patches/qt-everywhere-opensource-src-4.8.7/series b/patches/qt-everywhere-opensource-src-4.8.7/series
index 9c07088cc..38b27595d 100644
--- a/patches/qt-everywhere-opensource-src-4.8.7/series
+++ b/patches/qt-everywhere-opensource-src-4.8.7/series
@@ -9,4 +9,5 @@
0007-phonon-fix-colors-for-video-on-qgraphicsview.patch
0008-don-t-build-webkit-tests.patch
0009-fix-build-issues-with-gcc6.patch
-# 3810087cb4ae9063abad39054889322f - git-ptx-patches magic
+0010-configure-handle-gcc-9.x.patch
+# 9134b7178aa4720695840ab37bb30482 - git-ptx-patches magic