From 9f7794266b93dd7c8aa3b96f084a38053a0a3445 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Fri, 30 Oct 2015 14:18:44 +0100 Subject: Remove qdoc patch not needed for anymore in dev/5.6 Change-Id: I5013bb78d9e0140b52b29d9789f97b0f0037eb48 Reviewed-by: Samuli Piippo --- .../0001-qdoc-workaround-for-gcc-s-ICE.patch | 29 ---------------------- recipes-qt/qt5/qtbase_%.bbappend | 2 -- 2 files changed, 31 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch diff --git a/recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch b/recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch deleted file mode 100644 index 85e569f..0000000 --- a/recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 75840ad8b40068b70792a27f1fdc7cccf3d28f7c Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Wed, 16 Sep 2015 13:30:38 +0300 -Subject: [PATCH] qdoc: workaround for gcc's ICE - -Remove c++11 option from compilation to prevent gcc's internal compiler error: -in add_stores, at var-tracking.c:6000 - -Signed-off-by: Samuli Piippo ---- - src/tools/qdoc/qdoc.pro | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro -index f0df113..a847482 100644 ---- a/src/tools/qdoc/qdoc.pro -+++ b/src/tools/qdoc/qdoc.pro -@@ -4,6 +4,8 @@ - requires(!contains(QT_DISABLED_FEATURES, dom)) - } - -+QMAKE_CXXFLAGS_CXX11 = -+ - option(host_build) - QT = core xml - --- -1.9.1 - diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend index 6ce74b2..bea5e18 100644 --- a/recipes-qt/qt5/qtbase_%.bbappend +++ b/recipes-qt/qt5/qtbase_%.bbappend @@ -39,9 +39,7 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" SRC_URI += " \ file://oe-device-extra.pri \ - file://0001-qdoc-workaround-for-gcc-s-ICE.patch \ " - do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf -- cgit v1.2.3-54-g00ecf