* [Buildroot] [PATCHv3] qt: Add option to build and install tools on the target
@ 2012-03-04 19:05 Ismael Luceno
2012-03-04 20:54 ` Arnout Vandecappelle
0 siblings, 1 reply; 4+ messages in thread
From: Ismael Luceno @ 2012-03-04 19:05 UTC (permalink / raw)
To: buildroot
Signed-off-by: Ismael Luceno <ismael.luceno@gmail.com>
---
package/qt/Config.in | 26 ++++++++++++++++++++++++++
package/qt/qt.mk | 10 ++++++++++
2 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/package/qt/Config.in b/package/qt/Config.in
index 3a552d0..3517eb8 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -16,6 +16,32 @@ config BR2_PACKAGE_QT_DEBUG
help
If unsure, say N.
+menuconfig BR2_PACKAGE_QT_TOOLS
+ bool "Compile and install tools"
+ depends on BR2_PACKAGE_QT_SQL_MODULE && BR2_PACKAGE_QT_GUI_MODULE
+ help
+ SQL module is nedded to build, but only required at run-time by a
+ few tools (assistant, designer, qmlviewer).
+
+if BR2_PACKAGE_QT_TOOLS
+
+config BR2_PACKAGE_QT_TOOLS_QTCONFIG
+ bool "qtconfig"
+ depends on BR2_PACKAGE_QT_GUI_X11
+
+config BR2_PACKAGE_QT_TOOLS_QMLVIEWER
+ bool "qmlviewer"
+ depends on BR2_PACKAGE_QT_DECLARATIVE
+
+config BR2_PACKAGE_QT_TOOLS_QMLPLUGINDUMP
+ bool "qmlplugindump"
+ depends on BR2_PACKAGE_QT_DECLARATIVE
+
+endif # BR2_PACKAGE_QT_TOOLS
+
+comment "Tools need the SQL and GUI modules"
+ depends on !BR2_PACKAGE_QT_SQL_MODULE || !BR2_PACKAGE_QT_GUI_MODULE
+
config BR2_PACKAGE_QT_DEMOS
bool "Compile and install demos and examples (with code)"
help
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 776eb63..ac7edda 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -417,6 +417,12 @@ else
QT_CONFIGURE_OPTS += -no-declarative
endif
+ifeq ($(BR2_PACKAGE_QT_TOOLS),y)
+QT_CONFIGURE_OPTS += -make tools
+else
+QT_CONFIGURE_OPTS += -nomake tools
+endif
+
# ccache and precompiled headers don't play well together
ifeq ($(BR2_CCACHE),y)
QT_CONFIGURE_OPTS += -no-pch
@@ -514,6 +520,9 @@ endef
QT_INSTALL_LIBS += QtCore
QT_HOST_PROGRAMS += moc rcc qmake lrelease
+QT_TARGET_PROGRAMS-$(BR2_PACKAGE_QT_TOOLS_QTCONFIG) += qtconfig
+QT_TARGET_PROGRAMS-$(BR2_PACKAGE_QT_TOOLS_QMLVIEWER) += qmlviewer
+QT_TARGET_PROGRAMS-$(BR2_PACKAGE_QT_TOOLS_QMLPLUGINDUMP) += qmlplugindump
ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
QT_INSTALL_LIBS += QtGui
@@ -583,6 +592,7 @@ define QT_INSTALL_STAGING_CMDS
$(MAKE) -C $(@D) install
mkdir -p $(HOST_DIR)/usr/bin
mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/usr/bin
+ mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_TARGET_PROGRAMS-y)) $(TARGET_DIR)/usr/bin
rm -rf $(HOST_DIR)/usr/mkspecs
mv $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr
$(QT_INSTALL_QT_CONF)
--
1.7.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCHv3] qt: Add option to build and install tools on the target
2012-03-04 19:05 [Buildroot] [PATCHv3] qt: Add option to build and install tools on the target Ismael Luceno
@ 2012-03-04 20:54 ` Arnout Vandecappelle
2012-03-05 9:03 ` [Buildroot] [PATCH] " Ismael Luceno
0 siblings, 1 reply; 4+ messages in thread
From: Arnout Vandecappelle @ 2012-03-04 20:54 UTC (permalink / raw)
To: buildroot
On Sunday 04 March 2012 20:05:41 Ismael Luceno wrote:
>
> Signed-off-by: Ismael Luceno <ismael.luceno@gmail.com>
If you make several versions of a patch it's useful to have a changelog
that specifies what you changed compared to the previous version.
> +menuconfig BR2_PACKAGE_QT_TOOLS
> + bool "Compile and install tools"
> + depends on BR2_PACKAGE_QT_SQL_MODULE && BR2_PACKAGE_QT_GUI_MODULE
> + help
> + SQL module is nedded to build, but only required at run-time by a
> + few tools (assistant, designer, qmlviewer).
nedded -> needed
This help text doesn't make much sense here; I meant as part of the
"Tools need the SQL and GUI modules" comment. But actually there it
also doesn't make sense because nobody looks at the help text of a
comment.
So maybe just leave it as a #-comment.
[snip]
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH] qt: Add option to build and install tools on the target
2012-03-04 20:54 ` Arnout Vandecappelle
@ 2012-03-05 9:03 ` Ismael Luceno
2012-03-05 9:32 ` Thomas Petazzoni
0 siblings, 1 reply; 4+ messages in thread
From: Ismael Luceno @ 2012-03-05 9:03 UTC (permalink / raw)
To: buildroot
Signed-off-by: Ismael Luceno <ismael.luceno@gmail.com>
---
package/qt/Config.in | 25 +++++++++++++++++++++++++
package/qt/qt.mk | 10 ++++++++++
2 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/package/qt/Config.in b/package/qt/Config.in
index 3a552d0..1c24d1f 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -16,6 +16,31 @@ config BR2_PACKAGE_QT_DEBUG
help
If unsure, say N.
+menuconfig BR2_PACKAGE_QT_TOOLS
+ bool "Compile and install tools"
+ depends on BR2_PACKAGE_QT_SQL_MODULE && BR2_PACKAGE_QT_GUI_MODULE
+ # SQL module is needed to build, but only required at run-time by a
+ # few tools (assistant, designer, qmlviewer).
+
+if BR2_PACKAGE_QT_TOOLS
+
+config BR2_PACKAGE_QT_TOOLS_QTCONFIG
+ bool "qtconfig"
+ depends on BR2_PACKAGE_QT_GUI_X11
+
+config BR2_PACKAGE_QT_TOOLS_QMLVIEWER
+ bool "qmlviewer"
+ depends on BR2_PACKAGE_QT_DECLARATIVE
+
+config BR2_PACKAGE_QT_TOOLS_QMLPLUGINDUMP
+ bool "qmlplugindump"
+ depends on BR2_PACKAGE_QT_DECLARATIVE
+
+endif # BR2_PACKAGE_QT_TOOLS
+
+comment "Tools need the SQL and GUI modules"
+ depends on !BR2_PACKAGE_QT_SQL_MODULE || !BR2_PACKAGE_QT_GUI_MODULE
+
config BR2_PACKAGE_QT_DEMOS
bool "Compile and install demos and examples (with code)"
help
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 776eb63..ac7edda 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -417,6 +417,12 @@ else
QT_CONFIGURE_OPTS += -no-declarative
endif
+ifeq ($(BR2_PACKAGE_QT_TOOLS),y)
+QT_CONFIGURE_OPTS += -make tools
+else
+QT_CONFIGURE_OPTS += -nomake tools
+endif
+
# ccache and precompiled headers don't play well together
ifeq ($(BR2_CCACHE),y)
QT_CONFIGURE_OPTS += -no-pch
@@ -514,6 +520,9 @@ endef
QT_INSTALL_LIBS += QtCore
QT_HOST_PROGRAMS += moc rcc qmake lrelease
+QT_TARGET_PROGRAMS-$(BR2_PACKAGE_QT_TOOLS_QTCONFIG) += qtconfig
+QT_TARGET_PROGRAMS-$(BR2_PACKAGE_QT_TOOLS_QMLVIEWER) += qmlviewer
+QT_TARGET_PROGRAMS-$(BR2_PACKAGE_QT_TOOLS_QMLPLUGINDUMP) += qmlplugindump
ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
QT_INSTALL_LIBS += QtGui
@@ -583,6 +592,7 @@ define QT_INSTALL_STAGING_CMDS
$(MAKE) -C $(@D) install
mkdir -p $(HOST_DIR)/usr/bin
mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/usr/bin
+ mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_TARGET_PROGRAMS-y)) $(TARGET_DIR)/usr/bin
rm -rf $(HOST_DIR)/usr/mkspecs
mv $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr
$(QT_INSTALL_QT_CONF)
--
1.7.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH] qt: Add option to build and install tools on the target
2012-03-05 9:03 ` [Buildroot] [PATCH] " Ismael Luceno
@ 2012-03-05 9:32 ` Thomas Petazzoni
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2012-03-05 9:32 UTC (permalink / raw)
To: buildroot
Le Mon, 5 Mar 2012 07:03:55 -0200,
Ismael Luceno <ismael.luceno@gmail.com> a ?crit :
> + mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_TARGET_PROGRAMS-y)) $(TARGET_DIR)/usr/bin
Are you sure this works fine if QT_TARGET_PROGRAMS-y is empty?
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-03-05 9:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-04 19:05 [Buildroot] [PATCHv3] qt: Add option to build and install tools on the target Ismael Luceno
2012-03-04 20:54 ` Arnout Vandecappelle
2012-03-05 9:03 ` [Buildroot] [PATCH] " Ismael Luceno
2012-03-05 9:32 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox