Skip to contentSkip to conversation

Revert "package/grantlee: fix build with Qt 5.x"

PATCH New Fabrice Fontaine 2 participants 4 messages Nov 3, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Revert "package/grantlee: fix build with Qt 5.x"

This reverts commit c975106f60d909b244f473e381b1ebffd943364a which does not seem to really work. The issue will be fixed by a patch retrieved from upstream.

---
 package/grantlee/grantlee.mk | 5 -----
 1 file changed, 5 deletions(-)
package/grantlee/grantlee.mk +0 -5
index c129fe40b2..575b63fef5 100644
@@ -11,9 +11,4 @@ GRANTLEE_LICENSE = LGPL-2.1+
 GRANTLEE_LICENSE_FILES = COPYING.LIB
 GRANTLEE_DEPENDENCIES = qt5base qt5script
 
-# qt5 needs c++11 (since qt-5.7)
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-GRANTLEE_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -std=c++11"
-endif
-
 $(eval $(cmake-package))
Signature · 1 line
2.23.0
#1 lore raw

PATCH 2/2 package/grantlee: fix build with newer cmake

Fixes:
- http://autobuild.buildroot.org/results/8cb0c153620be5765c098f05a2440fa1f3e4e2c2

---
 .../0001-Remove-vestigial-ansi-flag.patch     | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 package/grantlee/0001-Remove-vestigial-ansi-flag.patch
package/grantlee/0001-Remove-vestigial-ansi-flag.patch new file +27 -0
new file mode 100644
index 0000000000..250463c2fd
@@ -0,0 +1,27 @@
+From c989fcf192d01d26866faf6405a28ba4fdce64c3 Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <[email protected]>
+Date: Sun, 21 Jul 2019 16:00:41 +0100
+Subject: [PATCH] Remove vestigial -ansi flag
+
+This causes the compiler to not operate in C++11 mode, meaning that
+headers such as <type_traits> issue errors.
+[Retrieved from:
+https://github.com/steveire/grantlee/commit/c989fcf192d01d26866faf6405a28ba4fdce64c3]
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6d51110..9172213 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,7 +59,7 @@ endif()
+ 
+ if (CMAKE_COMPILER_IS_GNUCXX)
+   set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common ")
++  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common ")
+ 
+   if (CMAKE_BUILD_TYPE MATCHES TestCocoon)
+     # Needed on 64 bit
Signature · 1 line
2.23.0
#3 lore raw

PATCH 1/2 Revert "package/grantlee: fix build with Qt 5.x"

In reply to Fabrice Fontaine
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

This reverts commit c975106f60d909b244f473e381b1ebffd943364a which does not seem to really work. The issue will be fixed by a patch retrieved from upstream.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard