Explorar o código

package/grantlee: enable building for Qt6

Signed-off-by: Zoltan Gyarmati <zgyarmati@zgyarmati.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Zoltan Gyarmati hai 1 ano
pai
achega
698c9f12c4
Modificáronse 2 ficheiros con 12 adicións e 4 borrados
  1. 5 3
      package/grantlee/Config.in
  2. 7 1
      package/grantlee/grantlee.mk

+ 5 - 3
package/grantlee/Config.in

@@ -1,8 +1,10 @@
 config BR2_PACKAGE_GRANTLEE
 config BR2_PACKAGE_GRANTLEE
 	bool "grantlee"
 	bool "grantlee"
-	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5
-	select BR2_PACKAGE_QT5SCRIPT
-	select BR2_PACKAGE_QT5BASE_GUI
+	depends on (BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) || BR2_PACKAGE_QT6
+	select BR2_PACKAGE_QT5SCRIPT if BR2_PACKAGE_QT5
+	select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5
+	select BR2_PACKAGE_QT6BASE_GUI if BR2_PACKAGE_QT6
+	select BR2_PACKAGE_QT6DECLARATIVE if BR2_PACKAGE_QT6
 	help
 	help
 	  Qt implementation of the Django template framework
 	  Qt implementation of the Django template framework
 
 

+ 7 - 1
package/grantlee/grantlee.mk

@@ -9,6 +9,12 @@ GRANTLEE_SITE = $(call github,steveire,grantlee,v$(GRANTLEE_VERSION))
 GRANTLEE_INSTALL_STAGING = YES
 GRANTLEE_INSTALL_STAGING = YES
 GRANTLEE_LICENSE = LGPL-2.1+
 GRANTLEE_LICENSE = LGPL-2.1+
 GRANTLEE_LICENSE_FILES = COPYING.LIB
 GRANTLEE_LICENSE_FILES = COPYING.LIB
-GRANTLEE_DEPENDENCIES = qt5base qt5script
+
+ifeq ($(BR2_PACKAGE_QT5BASE),y)
+GRANTLEE_DEPENDENCIES += qt5base qt5script
+else ifeq ($(BR2_PACKAGE_QT6BASE),y)
+GRANTLEE_DEPENDENCIES += qt6base qt6declarative
+GRANTLEE_CONF_OPTS += -DGRANTLEE_BUILD_WITH_QT6=ON
+endif
 
 
 $(eval $(cmake-package))
 $(eval $(cmake-package))