Skip to contentSkip to conversation

package/grantlee: fix build with Qt 5.x

PATCH New Fabrice Fontaine 2 participants 3 messages Nov 1, 2019 – Nov 2, 2019

lore
Share & tools
lore
#0 lore raw

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

Fixes:
- http://autobuild.buildroot.org/results/f0ec288fe47b6e8cf16179e3f281cf9caebb8fe9

---
 package/grantlee/grantlee.mk | 5 +++++
 1 file changed, 5 insertions(+)
package/grantlee/grantlee.mk +5 -0
index 575b63fef5..c129fe40b2 100644
@@ -11,4 +11,9 @@ 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: add hash for license file

---
 package/grantlee/grantlee.hash | 3 +++
 1 file changed, 3 insertions(+)
package/grantlee/grantlee.hash +3 -0
index cdff778041..2be423bd95 100644
@@ -1,2 +1,5 @@
 # Locally calculated after checking pgp signature
 sha256  ea2e402466c74bb533eee2c7252209ec61cd93a5d236fecd625b4a0eb13a1478    grantlee-5.1.0.tar.gz
+
+# Hash for license file
+sha256  a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861    COPYING.LIB
Signature · 1 line
2.23.0
#2 lore raw

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

In reply to Fabrice Fontaine

Hello Fabrice,

Quoted 7 lines · On Fri, 1 Nov 2019 11:59:05 +0100 Fabrice Fontaine…

Fixes:
- http://autobuild.buildroot.org/results/f0ec288fe47b6e8cf16179e3f281cf9caebb8fe9

---
 package/grantlee/grantlee.mk | 5 +++++
 1 file changed, 5 insertions(+)

To be honest, I am not sure this is the most correct fix. Indeed, Grantlee's build system should itself know that Qt5 needs C+11 support, and therefore add the appropriate compiler flags.

However, for the sake of fixing the issue immediately, I've applied the patch as-is, as well as your PATCH 2/2.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com