[Buildroot] [git commit branch/next] package/qt6/qt6base: use the CMAKE_NINJA flag
Thomas Petazzoni
thomas.petazzoni at bootlin.com
Mon Aug 7 21:26:28 UTC 2023
commit: https://git.buildroot.net/buildroot/commit/?id=df8b0643b538f33cd605a002cdee65a5a4a8b3e9
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
Use the newly introduce backend option (4cf79d9b71ff5cf2aede3f21e09ade7c7ac59606)
to specify what cmake backend to use, instead of special-coding it's use.
Signed-off-by: Thomas Devoogdt <thomas.devoogdt at barco.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
package/qt6/qt6base/qt6base.mk | 26 ++------------------------
1 file changed, 2 insertions(+), 24 deletions(-)
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index e6cf4f14bb..4a01bb17b2 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -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.
More information about the buildroot
mailing list