NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/qt6/qt6base: use the CMAKE_NINJA flag

Browse Source 
Use the newly introduce backend option (4cf79d9b71)
to specify what cmake backend to use, instead of special-coding it's use.

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Thomas Devoogdt 2023-08-07 16:58:39 +02:00 committed by Thomas Petazzoni
parent 14956518c8
commit df8b0643b5
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
package/qt6/qt6base/qt6base.mk
View File

@ -8,6 +8,8 @@ QT6BASE_VERSION = $(QT6_VERSION)
QT6BASE_SITE = $(QT6_SITE)
QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz
QT6BASE_CMAKE_BACKEND = ninja
QT6BASE_LICENSE = \
GPL-2.0+ or LGPL-3.0, \
GPL-3.0 with exception (tools), \
@ -29,7 +31,6 @@ QT6BASE_LICENSE_FILES = \
LICENSES/Qt-GPL-exception-1.0.txt
QT6BASE_DEPENDENCIES = \
host-ninja \
host-qt6base \
double-conversion \
libb2 \
@ -38,7 +39,6 @@ QT6BASE_DEPENDENCIES = \
QT6BASE_INSTALL_STAGING = YES
QT6BASE_CONF_OPTS = \
-GNinja \
-DQT_HOST_PATH=$(HOST_DIR) \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=OFF \
@ -76,26 +76,12 @@ QT6BASE_CONF_OPTS += \
-DFEATURE_avx512vl=OFF \
-DFEATURE_vaes=OFF
define QT6BASE_BUILD_CMDS
$(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6BASE_BUILDDIR)
endef
define QT6BASE_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR)
endef
define QT6BASE_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR)
endef
HOST_QT6BASE_DEPENDENCIES = \
host-ninja \
host-double-conversion \
host-libb2 \
host-pcre2 \
host-zlib
HOST_QT6BASE_CONF_OPTS = \
-GNinja \
-DFEATURE_gui=OFF \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
@ -110,14 +96,6 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_system_pcre2=ON \
-DFEATURE_system_zlib=ON
define HOST_QT6BASE_BUILD_CMDS
$(HOST_MAKE_ENV) $(BR2_CMAKE) --build $(HOST_QT6BASE_BUILDDIR)
endef
define HOST_QT6BASE_INSTALL_CMDS
$(HOST_MAKE_ENV) $(BR2_CMAKE) --install $(HOST_QT6BASE_BUILDDIR)
endef
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.