diff mbox series

[2/2] package/grantlee: fix build with newer cmake

Message ID 20191103101507.30364-2-fontaine.fabrice@gmail.com
State Accepted
Commit 2130f663ece46b030f07ac042a21ddb06058a103
Headers show
Series [1/2] Revert "package/grantlee: fix build with Qt 5.x" | expand

Commit Message

Fabrice Fontaine Nov. 3, 2019, 10:15 a.m. UTC 
Fixes:
 - http://autobuild.buildroot.org/results/8cb0c153620be5765c098f05a2440fa1f3e4e2c2

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .../0001-Remove-vestigial-ansi-flag.patch     | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 package/grantlee/0001-Remove-vestigial-ansi-flag.patch

Comments

Peter Korsgaard Nov. 3, 2019, 6:48 p.m. UTC | #1 
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

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

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks.
diff mbox series

Patch

diff --git a/package/grantlee/0001-Remove-vestigial-ansi-flag.patch b/package/grantlee/0001-Remove-vestigial-ansi-flag.patch
new file mode 100644
index 0000000000..250463c2fd
--- /dev/null
+++ b/package/grantlee/0001-Remove-vestigial-ansi-flag.patch
@@ -0,0 +1,27 @@ 
+From c989fcf192d01d26866faf6405a28ba4fdce64c3 Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <steveire@gmail.com>
+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 <fontaine.fabrice@gmail.com>
+---
+ 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