[v6,11/28] package/qt5webchannel: Convert to qmake infra

Message ID	20200217212350.29750-12-anaumann@ultratronik.de
State	Accepted
Headers	show Return-Path: <buildroot-bounces@busybox.net> From: Andreas Naumann <anaumann@ultratronik.de> To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:33 +0100 Message-Id: <20200217212350.29750-12-anaumann@ultratronik.de> In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 11/28] package/qt5webchannel: Convert to qmake infra Precedence: list Cc: Andreas Naumann <anaumann@ultratronik.de>, Peter Seiderer <ps.report@gmx.net>, Julien Corjon <corjon.j@ecagroup.com>, Thomas Petazzoni <thomas.petazzoni@bootlin.com>, Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" <buildroot-bounces@busybox.net>
Series	Qt5 qmake infra and per-package compatibility \| expand [v6,00/28] Qt5 qmake infra and per-package compatibility [v6,01/28] package/qt5base: Do not build shared libs if BR2_STATIC_LIBS is chosen [v6,02/28] core/pkg-infra: Add generic qmake package infrastructure [v6,03/28] qt5: Convert straightforward packages to qmake infra [v6,04/28] package/qt5base: Convert to qmake infra [v6,05/28] package/qwt: Partially convert to qmake infra [v6,06/28] package/qwt: Add missing qt5svg dependency [v6,07/28] package/qt5tools: Partially convert to qmake infra [v6,08/28] package/qt5virtualkeyboard: Convert to qmake infra [v6,09/28] package/quazip: Convert to qmake infra [v6,10/28] package/qt5wayland: Convert to qmake infra [v6,11/28] package/qt5webchannel: Convert to qmake infra [v6,12/28] package/qt5webkit: Convert to qmake infra [v6,13/28] package/qt5webkit-examples: Convert to qmake infra [v6,14/28] package/qt5webengine: Convert to qmake infra [v6,15/28] package/qt-webkit-kiosk: Convert to qmake infra [v6,16/28] package/qt5cinex: Convert to qmake infra [v6,17/28] core/pkg-infra: Fix package file statistics for parallel build [v6,18/28] package/cmake: Fix for using -O in top-level make [v6,19/28] core/pkg-infra: Add per-package support in qmake infra [v6,20/28] qt5: Fix pkgconfig search path for per-package infrastructure [v6,21/28] package/python-sip: Fix qmake usage for per-package build [v6,22/28] package/python-pyqt5: Fix qmake usage for per-package build [v6,23/28] package/qt5webengine: add libXdamage as XCB dependency [v6,24/28] package/qt5webengine: Add optional dependency on qt5quickcontrols2 [v6,25/28] package/qt5webengine: Add optional dependency on qt5location [v6,26/28] package/qt5virtualkeyboard: Add optional dependency on qt5quickcontrols2 [v6,27/28] package/qt53d: Add optional dependency on qt5multimedia [v6,28/28] package/qt5charts: Add optional dependency on qt5multimedia

Message ID

20200217212350.29750-12-anaumann@ultratronik.de

State

Accepted

Headers

From: Andreas Naumann <anaumann@ultratronik.de>
To: buildroot@buildroot.org
Date: Mon, 17 Feb 2020 22:23:33 +0100
Message-Id: <20200217212350.29750-12-anaumann@ultratronik.de>
In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de>
References: <20200217212350.29750-1-anaumann@ultratronik.de>
MIME-Version: 1.0
Subject: [Buildroot] [PATCH v6 11/28] package/qt5webchannel: Convert to
	qmake infra
Precedence: list
Cc: Andreas Naumann <anaumann@ultratronik.de>,
	Peter Seiderer <ps.report@gmx.net>,
	Julien Corjon <corjon.j@ecagroup.com>, 
	Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
	Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: buildroot-bounces@busybox.net
Sender: "buildroot" <buildroot-bounces@busybox.net>

Series

Qt5 qmake infra and per-package compatibility | expand

Commit Message

Andreas Naumann Feb. 17, 2020, 9:23 p.m. UTC

The install of the javascript is custom and thus needs to be kept.

Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
---
 package/qt5/qt5webchannel/qt5webchannel.mk | 39 ++--------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

Comments

Thomas Petazzoni March 11, 2020, 9:49 p.m. UTC | #1

On Mon, 17 Feb 2020 22:23:33 +0100
Andreas Naumann <anaumann@ultratronik.de> wrote:

> The install of the javascript is custom and thus needs to be kept.
> 
> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
> ---
>  package/qt5/qt5webchannel/qt5webchannel.mk | 39 ++--------------------
>  1 file changed, 2 insertions(+), 37 deletions(-)

Applied to master, thanks.

Thomas

diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk
index 22523036e7..112d5218ba 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.mk
+++ b/package/qt5/qt5webchannel/qt5webchannel.mk
@@ -25,18 +25,6 @@  ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
 QT5WEBCHANNEL_DEPENDENCIES += qt5declarative
 endif
 
-define QT5WEBCHANNEL_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
-endef
-
-define QT5WEBCHANNEL_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
-endef
-
-define QT5WEBCHANNEL_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
-endef
-
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
 define QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT
 	$(INSTALL) -m 0644 -D $(@D)/examples/webchannel/shared/qwebchannel.js \
@@ -49,29 +37,6 @@  define QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT
 endef
 endif
 
-ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
-define QT5WEBCHANNEL_INSTALL_TARGET_QMLS
-	cp -dpfr $(STAGING_DIR)/usr/qml/QtWebChannel $(TARGET_DIR)/usr/qml/
-endef
-endif
-
-ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-define QT5WEBCHANNEL_INSTALL_TARGET_EXAMPLES
-	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/webchannel $(TARGET_DIR)/usr/lib/qt/examples/
-endef
-endif
-
-ifneq ($(BR2_STATIC_LIBS),y)
-define QT5WEBCHANNEL_INSTALL_TARGET_LIBS
-	cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebChannel.so.* $(TARGET_DIR)/usr/lib
-endef
-endif
-
-define QT5WEBCHANNEL_INSTALL_TARGET_CMDS
-	$(QT5WEBCHANNEL_INSTALL_TARGET_LIBS)
-	$(QT5WEBCHANNEL_INSTALL_TARGET_QMLS)
-	$(QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT)
-	$(QT5WEBCHANNEL_INSTALL_TARGET_EXAMPLES)
-endef
+QT5WEBCHANNEL_POST_INSTALL_TARGET_HOOKS += QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT
 
-$(eval $(generic-package))
+$(eval $(qmake-package))

[v6,11/28] package/qt5webchannel: Convert to qmake infra

Commit Message

Comments

Patch