diff mbox series

[v2,2/3] package/qt6/qt6tools: separate host and target options

Message ID 20240904211049.866640-2-roykollensvendsen@gmail.com
State Accepted
Headers show
Series [v2,1/3] package/qt6/qt6base: allow selecting the host print support module | expand

Commit Message

Roy Kollen Svendsen Sept. 4, 2024, 9:10 p.m. UTC 
Add Config.in.host to allow separating options affecting host and target
builds.

Move/copy parts of Config.in into Config.in.host.

Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
In response to:
https://patchwork.ozlabs.org/project/buildroot/patch/20240904122040.738362-1-roykollensvendsen@gmail.com/

Changes v1 -> v2:
  - this patch was added to the series as a preliminary step to move the host
  linguist tools option (see patch 3/3) into Config.in.host

 package/qt6/Config.in.host          |  1 +
 package/qt6/qt6tools/Config.in      |  8 ++------
 package/qt6/qt6tools/Config.in.host | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 package/qt6/qt6tools/Config.in.host
diff mbox series

Patch

diff --git a/package/qt6/Config.in.host b/package/qt6/Config.in.host
index dfe7865c57..fa5c39cce1 100644
--- a/package/qt6/Config.in.host
+++ b/package/qt6/Config.in.host
@@ -1,5 +1,6 @@ 
 if BR2_PACKAGE_QT6
 
 source "package/qt6/qt6base/Config.in.host"
+source "package/qt6/qt6tools/Config.in.host"
 
 endif
diff --git a/package/qt6/qt6tools/Config.in b/package/qt6/qt6tools/Config.in
index 5f52c5644f..1828e5f043 100644
--- a/package/qt6/qt6tools/Config.in
+++ b/package/qt6/qt6tools/Config.in
@@ -1,12 +1,8 @@ 
 config BR2_PACKAGE_QT6TOOLS
 	bool "qt6tools"
+	# The Qt Network module is required
 	select BR2_PACKAGE_QT6BASE_NETWORK
-	# qt6tools needs host-qt6tools, and host-qt6tools needs
-	# network support in qt6base. In addition, we also need
-	# host-qt6base with Sql support to build the qhelpgenerator
-	# tool, if target support for Sql is present
-	select BR2_PACKAGE_HOST_QT6BASE_NETWORK
-	select BR2_PACKAGE_HOST_QT6BASE_SQL if BR2_PACKAGE_QT6BASE_SQL
+	select BR2_PACKAGE_HOST_QT6TOOLS
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
diff --git a/package/qt6/qt6tools/Config.in.host b/package/qt6/qt6tools/Config.in.host
new file mode 100644
index 0000000000..4fd28172b9
--- /dev/null
+++ b/package/qt6/qt6tools/Config.in.host
@@ -0,0 +1,15 @@ 
+config BR2_PACKAGE_HOST_QT6TOOLS
+	bool "host qt6tools"
+	# The Qt Qt Network module is required
+	select BR2_PACKAGE_HOST_QT6BASE_NETWORK
+	# Requires the Qt Sql module to build the qhelpgenerator
+	# tool, if target support for Sql is present
+	select BR2_PACKAGE_HOST_QT6BASE_SQL if BR2_PACKAGE_QT6BASE_SQL
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  Qt Tools provides tools facilitate the development
+	  and design of applications.
+
+	  https://github.com/qt/qttools