Skip to contentSkip to conversation

qt5base: add an option to build and install examples

PATCH New Fatih Aşıcı 2 participants 2 messages Jan 2, 2014

lore
Share & tools
lore

Fatih Aşıcı

author
#0 lore raw

PATCH v2 1/1 qt5base: add an option to build and install examples

Signed-off-by Fatih A??c? <[email protected]>
Tested-by Ezequiel Garcia <[email protected]>

---
Changes v1 -> v2:
- rebase against current master
- drop upstreamed patches
- no need to pass -compile-examples as it is default now
- add configure option using a one-line if block

---
 package/qt5/qt5base/Config.in  |  7 +++++++
 package/qt5/qt5base/qt5base.mk | 14 +++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
package/qt5/qt5base/Config.in +7 -0
index e932e24..3090d65 100644
@@ -28,6 +28,13 @@ config BR2_PACKAGE_QT5BASE_LICENSE_APPROVED
 
 	  See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
 
+config BR2_PACKAGE_QT5BASE_EXAMPLES
+	bool "Compile and install examples (with code)"
+	select BR2_PACKAGE_QT5BASE_NETWORK
+	select BR2_PACKAGE_QT5BASE_XML
+	help
+	  If unsure, say N.
+
 config BR2_PACKAGE_QT5BASE_NETWORK
 	bool "network module"
 	help
package/qt5/qt5base/qt5base.mk +13 -1
index e46bdeb..6928bb8 100644
@@ -134,6 +134,8 @@ QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_LIBGLIB2),libglib2)
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_ICU),-icu,-no-icu)
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu)
 
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples
+
 # Build the list of libraries to be installed on the target
 QT5BASE_INSTALL_LIBS_y                                 += Qt5Core
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK)    += Qt5Network

@@ -162,8 +164,9 @@ define QT5BASE_CONFIGURE_CMDS
 		-headerdir /usr/include/qt5 \
 		-sysroot $(STAGING_DIR) \
 		-plugindir /usr/lib/qt/plugins \
+		-examplesdir /usr/lib/qt/examples \
 		-no-rpath \
-		-nomake examples -nomake tests \
+		-nomake tests \
 		-device buildroot \
 		-device-option CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
 		-device-option BUILDROOT_COMPILER_CFLAGS="$(TARGET_CFLAGS)" \

@@ -203,15 +206,24 @@ define QT5BASE_INSTALL_TARGET_FONTS
 	fi
 endef
 
+define QT5BASE_INSTALL_TARGET_EXAMPLES
+	if [ -d $(STAGING_DIR)/usr/lib/qt/examples/ ] ; then \
+		mkdir -p $(TARGET_DIR)/usr/lib/qt/examples ; \
+		cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/* $(TARGET_DIR)/usr/lib/qt/examples ; \
+	fi
+endef
+
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
 define QT5BASE_INSTALL_TARGET_CMDS
 	$(QT5BASE_INSTALL_TARGET_FONTS)
+	$(QT5BASE_INSTALL_TARGET_EXAMPLES)
 endef
 else
 define QT5BASE_INSTALL_TARGET_CMDS
 	$(QT5BASE_INSTALL_TARGET_LIBS)
 	$(QT5BASE_INSTALL_TARGET_PLUGINS)
 	$(QT5BASE_INSTALL_TARGET_FONTS)
+	$(QT5BASE_INSTALL_TARGET_EXAMPLES)
 endef
 endif
Signature · 1 line
1.8.5.2
Applied
#1 lore raw

PATCH v2 1/1 qt5base: add an option to build and install examples

Dear Fatih A??c?,

Quoted 9 lines · Fatih A??c?
Signed-off-by Fatih A??c? <[email protected]>
Tested-by Ezequiel Garcia <[email protected]>

---
Changes v1 -> v2:
- rebase against current master
- drop upstreamed patches
- no need to pass -compile-examples as it is default now
- add configure option using a one-line if block

Quoted 4 lines
---
 package/qt5/qt5base/Config.in  |  7 +++++++
 package/qt5/qt5base/qt5base.mk | 14 +++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com