From patchwork Mon Feb 17 21:23:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239588 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Lxt92FD5z9sRG for ; Tue, 18 Feb 2020 08:28:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AC901857C1; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RQ10WvcbPkQD; Mon, 17 Feb 2020 21:28:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7FBDD8565B; Mon, 17 Feb 2020 21:28:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 4B7761BF37B for ; Mon, 17 Feb 2020 21:28:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 45E8420494 for ; Mon, 17 Feb 2020 21:28:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2wN9L49Sjn7V for ; Mon, 17 Feb 2020 21:28:09 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by silver.osuosl.org (Postfix) with ESMTPS id 3418A20002 for ; Mon, 17 Feb 2020 21:28:09 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 606A5B9019C0; Mon, 17 Feb 2020 22:28:07 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:23 +0100 Message-Id: <20200217212350.29750-2-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 01/28] package/qt5base: Do not build shared libs if BR2_STATIC_LIBS is chosen X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Traditionally we configured qt5 to always build shared libraries. This resulted in many conditionals when setting buildroot to static-libs only, because each module's target install had to be guarded. So to avoid this and simplify target install in a subsequent commit, configure qt to build (and install) only the type of libs which the buildroot defconfig is set to. Unfortunately it seems that Qt does not support building both dynamic and static libs at the same time, so we still set it shared if buildroot asks for both. Signed-off-by: Andreas Naumann --- package/qt5/qt5base/qt5base.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 774c771bc9..c662921b8f 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -24,8 +24,13 @@ QT5BASE_CONFIGURE_OPTS += \ -no-iconv \ -system-zlib \ -system-pcre \ - -no-pch \ - -shared + -no-pch + +ifeq ($(BR2_STATIC_LIBS),y) +QT5BASE_CONFIGURE_OPTS += -static +else +QT5BASE_CONFIGURE_OPTS += -shared +endif # starting from version 5.9.0, -optimize-debug is enabled by default # for debug builds and it overrides -O* with -Og which is not what we From patchwork Mon Feb 17 21:23:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239591 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48LxtJ74xHz9sRt for ; Tue, 18 Feb 2020 08:28:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4A1BC20496; Mon, 17 Feb 2020 21:28:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uUw2ecHUmBaA; Mon, 17 Feb 2020 21:28:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 725B72048D; Mon, 17 Feb 2020 21:28:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 6AB2E1BF37B for ; Mon, 17 Feb 2020 21:28:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 659CF20494 for ; Mon, 17 Feb 2020 21:28:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GJQ9653Tkq2J for ; Mon, 17 Feb 2020 21:28:09 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by silver.osuosl.org (Postfix) with ESMTPS id 89CF42048D for ; Mon, 17 Feb 2020 21:28:09 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id BC3EAB901E25; Mon, 17 Feb 2020 22:28:07 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:24 +0100 Message-Id: <20200217212350.29750-3-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 02/28] core/pkg-infra: Add generic qmake package infrastructure X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This provides generic functions for Qt5 qmake based packages. It will make it possible to remove lots of redefinition of QT5_xxx_{CONFIGURE|BUILD| INSTALL_STATGING}_CMDS. Additionally it provides a generic target install method which will make most of the package specific commands obsolete. This is done by re-running the install step of the qmake generated Makefile with the package build directory prepended (to the staging/host path). Even though this does create lengthy pathes it allows for easy separation of the staging files from the host destined files by just omitting the resulting BUILD_DIR+HOST_DIR path from the following rsync call to the real target folder. The cleanup of many files we dont want in target is deferred to the target-finalize step. In addition to what's being removed already, we also have to cleanup some Qt5 specific files (prl) and the documentation directory. This approach was chosen over copying all files recorded in the pkg-files-list after some discussion which Thomas Petazzoni summed up: "We don't yet use pkg-files-list really as part of the build process anywhere, I feel a bit more comfortable at this point with what Andreas is proposing." Getting rid of the many conditional install commands is possible because qmake already takes care of this when generating the Makefile install targets with the given or autodetected configure options of each package. However, custom install steps may have to remain in cases where a particular buildroot option has no corresponding setting in the packages configuration options. Signed-off-by: Andreas Naumann --- Makefile | 5 +- docs/manual/adding-packages-qmake.txt | 85 +++++++++++++++++++++ docs/manual/adding-packages.txt | 2 + package/Makefile.in | 1 + package/pkg-qmake.mk | 105 ++++++++++++++++++++++++++ 5 files changed, 196 insertions(+), 2 deletions(-) create mode 100644 docs/manual/adding-packages-qmake.txt create mode 100644 package/pkg-qmake.mk diff --git a/Makefile b/Makefile index a52f1c75fd..4cd3d2ba79 100644 --- a/Makefile +++ b/Makefile @@ -737,10 +737,11 @@ target-finalize: $(PACKAGES) $(TARGET_DIR) host-finalize $(foreach hook,$(TARGET_FINALIZE_HOOKS),$($(hook))$(sep)) rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \ $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \ - $(TARGET_DIR)/usr/lib/cmake $(TARGET_DIR)/usr/share/cmake + $(TARGET_DIR)/usr/lib/cmake $(TARGET_DIR)/usr/share/cmake \ + $(TARGET_DIR)/usr/doc find $(TARGET_DIR)/usr/{lib,share}/ -name '*.cmake' -print0 | xargs -0 rm -f find $(TARGET_DIR)/lib/ $(TARGET_DIR)/usr/lib/ $(TARGET_DIR)/usr/libexec/ \ - \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f + \( -name '*.a' -o -name '*.la' -o -name '*.prl' \) -print0 | xargs -0 rm -f ifneq ($(BR2_PACKAGE_GDB),y) rm -rf $(TARGET_DIR)/usr/share/gdb endif diff --git a/docs/manual/adding-packages-qmake.txt b/docs/manual/adding-packages-qmake.txt new file mode 100644 index 0000000000..9b5193d67f --- /dev/null +++ b/docs/manual/adding-packages-qmake.txt @@ -0,0 +1,85 @@ +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: + +=== Infrastructure for QMake-based packages + +[[qmake-package-tutorial]] + +==== +qmake-package+ tutorial + +First, let's see how to write a +.mk+ file for a QMake-based package, with +an example : + +------------------------ +01: ################################################################################ +02: # +03: # libfoo +04: # +05: ################################################################################ +06: +07: LIBFOO_VERSION = 1.0 +08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz +09: LIBFOO_SITE = http://www.foosoftware.org/download +10: LIBFOO_CONF_OPTS = QT_CONFIG+=bar QT_CONFIG-=baz +11: LIBFOO_DEPENDENCIES = bar +12: +13: $(eval $(qmake-package)) +------------------------ + +On line 7, we declare the version of the package. + +On line 8 and 9, we declare the name of the tarball (xz-ed tarball +recommended) and the location of the tarball on the Web. Buildroot +will automatically download the tarball from this location. + +On line 10, we tell Buildroot what options to enable for libfoo. + +On line 11, we tell Buildroot the depednencies of libfoo. + +Finally, on line line 13, we invoke the +qmake-package+ +macro that generates all the Makefile rules that actually allows the +package to be built. + +[[qmake-package-reference]] + +==== +qmake-package+ reference + +The main macro of the QMake package infrastructure is +qmake-package+. +It is similar to the +generic-package+ macro. + +Just like the generic infrastructure, the QMake infrastructure works +by defining a number of variables before calling the +qmake-package+ +macro. + +First, all the package metadata information variables that exist in +the generic infrastructure also exist in the QMake infrastructure: ++LIBFOO_VERSION+, +LIBFOO_SOURCE+, +LIBFOO_PATCH+, +LIBFOO_SITE+, ++LIBFOO_SUBDIR+, +LIBFOO_DEPENDENCIES+, +LIBFOO_INSTALL_STAGING+, ++LIBFOO_INSTALL_TARGET+. + +An additional variable, specific to the QMake infrastructure, can +also be defined. + +* +LIBFOO_QMAKE_OPTS+, to specify additional options to pass to the + +qmake+ script at every step of the package build process: configure, + build and installation. By default, empty. + +* +LIBFOO_CONF_ENV+, to specify additional environment variables to + pass to the +qmake+ script for the configuration step. By default, empty. + +* +LIBFOO_CONF_OPTS+, to specify additional options to pass to the + +qmake+ script for the configuration step. By default, empty. + +* +LIBFOO_MAKE_ENV+, to specify additional environment variables to the + +make+ command during the build and install steps. By default, empty. + +* +LIBFOO_MAKE_OPTS+, to specify additional targets to pass to the + +make+ command during the build step. By default, empty. + +* +LIBFOO_INSTALL_STAGING_OPTS+, to specify additional targets to pass + to the +make+ command during the staging installation step. By default, + +install+. + +* +LIBFOO_INSTALL_TARGET_OPTS+, to specify additional targets to pass + to the +make+ command during the target installation step. By default, + +install+. diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt index 4a4a17e879..814355cd76 100644 --- a/docs/manual/adding-packages.txt +++ b/docs/manual/adding-packages.txt @@ -41,6 +41,8 @@ include::adding-packages-cargo.txt[] include::adding-packages-golang.txt[] +include::adding-packages-qmake.txt[] + include::adding-packages-kernel-module.txt[] include::adding-packages-asciidoc.txt[] diff --git a/package/Makefile.in b/package/Makefile.in index 285e2837ef..51f5cbce4f 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -426,3 +426,4 @@ include package/pkg-kernel-module.mk include package/pkg-waf.mk include package/pkg-golang.mk include package/pkg-meson.mk +include package/pkg-qmake.mk diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk new file mode 100644 index 0000000000..53ac3e4a1c --- /dev/null +++ b/package/pkg-qmake.mk @@ -0,0 +1,105 @@ +################################################################################ +# QMake package infrastructure +# +# This file implements an infrastructure that eases development of package +# .mk files for QMake packages. It should be used for all packages that use +# Qmake as their build system. +# +# See the Buildroot documentation for details on the usage of this +# infrastructure +# +# In terms of implementation, this QMake infrastructure requires the .mk file +# to only specify metadata information about the package: name, version, +# download URL, etc. +# +# We still allow the package .mk file to override what the different steps +# are doing, if needed. For example, if _BUILD_CMDS is already defined, +# it is used as the list of commands to perform to build the package, +# instead of the default QMake behaviour. The package can also define some +# post operation hooks. +# +################################################################################ + +################################################################################ +# inner-qmake-package -- defines how the configuration, compilation and +# installation of a qmake package should be done, implements a few hooks +# to tune the build process for qmake specifities and calls the generic +# package infrastructure to generate the necessary make targets +# +# argument 1 is the lowercase package name +# argument 2 is the uppercase package name, including a HOST_ prefix +# for host packages +################################################################################ + +define inner-qmake-package + +$(2)_CONF_ENV ?= +$(2)_CONF_OPTS ?= +$(2)_MAKE_ENV ?= +$(2)_MAKE_OPTS ?= +$(2)_INSTALL_STAGING_OPTS ?= install +$(2)_INSTALL_TARGET_OPTS ?= $$($(2)_INSTALL_STAGING_OPTS) + +# +# Configure step. Only define it if not already defined by the package +# .mk file. +# +ifndef $(2)_CONFIGURE_CMDS +define $(2)_CONFIGURE_CMDS + cd $$($(2)_BUILDDIR) && \ + $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT5_QMAKE) $$($(2)_CONF_OPTS) +endef +endif + +# +# Build step. Only define it if not already defined by the package .mk +# file. +# +ifndef $(2)_BUILD_CMDS +define $(2)_BUILD_CMDS + $$(TARGET_MAKE_ENV) $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_BUILDDIR) $$($(2)_MAKE_OPTS) +endef +endif + +# +# Staging installation step. Only define it if not already defined by +# the package .mk file. +# +ifndef $(2)_INSTALL_STAGING_CMDS +define $(2)_INSTALL_STAGING_CMDS + $$(TARGET_MAKE_ENV) $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_BUILDDIR) $$($(2)_INSTALL_STAGING_OPTS) +endef +endif + +# +# Target installation step. Only define it if not already defined by +# the package .mk file. +# +# Unfortunately we can't use INSTALL_ROOT to directly install to TARGET_DIR +# because in a crosscompile setup, the qmake generated install destinations +# are prefixed with the hardcoded sysroot (=STAGING_DIR) and hostprefix +# (=HOST_DIR). +# Instead we set INSTALL_ROOT, which comes before the install path, to a +# temporary folder inside the build directory and effectively install to +# $(@D)/tmp-target-install/$(STAGING_DIR) and $(@D)/tmp-target-install/$(HOST_DIR). +# We subsequently rsync only the files from the temporary staging dir and that +# way exclude files for the build host from target. +# +ifndef $(2)_INSTALL_TARGET_CMDS +define $(2)_INSTALL_TARGET_CMDS + $$(TARGET_MAKE_ENV) $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_BUILDDIR) INSTALL_ROOT=$$($(2)_BUILDDIR)tmp-target-install $$($(2)_INSTALL_TARGET_OPTS) + rsync -arv $$($(2)_BUILDDIR)tmp-target-install$$(STAGING_DIR)/ $$(TARGET_DIR)/ +endef +endif + +# Call the generic package infrastructure to generate the necessary +# make targets +$(call inner-generic-package,$(1),$(2),$(3),$(4)) + +endef + +################################################################################ +# qmake-package -- the target generator macro for QMake packages +################################################################################ + +qmake-package = $(call inner-qmake-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) From patchwork Mon Feb 17 21:23:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239595 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48LxtP4j93z9sRJ for ; Tue, 18 Feb 2020 08:28:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id ED3FC8565B; Mon, 17 Feb 2020 21:28:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JIn8og76ydPr; Mon, 17 Feb 2020 21:28:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id C8A21858DD; Mon, 17 Feb 2020 21:28:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 3D7841BF963 for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 35B5C857D8 for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id r3vChKDP26z8 for ; Mon, 17 Feb 2020 21:28:10 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 3B8178392B for ; Mon, 17 Feb 2020 21:28:10 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 25F6EB90207F; Mon, 17 Feb 2020 22:28:08 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:25 +0100 Message-Id: <20200217212350.29750-4-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 03/28] qt5: Convert straightforward packages to qmake infra X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This converts all qmake packages to the new infra for which no custom environments, option or additional hooks are needed. Signed-off-by: Andreas Naumann --- package/qextserialport/qextserialport.mk | 22 +------ package/qt5/qt53d/qt53d.mk | 38 +----------- package/qt5/qt5canvas3d/qt5canvas3d.mk | 25 +------- package/qt5/qt5charts/qt5charts.mk | 40 +------------ .../qt5/qt5connectivity/qt5connectivity.mk | 59 +------------------ package/qt5/qt5declarative/qt5declarative.mk | 47 +-------------- package/qt5/qt5enginio/qt5enginio.mk | 38 +----------- .../qt5graphicaleffects.mk | 18 +----- .../qt5/qt5imageformats/qt5imageformats.mk | 20 +------ package/qt5/qt5location/qt5location.mk | 49 +-------------- package/qt5/qt5multimedia/qt5multimedia.mk | 46 +-------------- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 41 +------------ .../qt5quickcontrols2/qt5quickcontrols2.mk | 40 +------------ package/qt5/qt5script/qt5script.mk | 31 +--------- package/qt5/qt5scxml/qt5scxml.mk | 36 +---------- package/qt5/qt5sensors/qt5sensors.mk | 39 +----------- package/qt5/qt5serialbus/qt5serialbus.mk | 37 +----------- package/qt5/qt5serialport/qt5serialport.mk | 31 +--------- package/qt5/qt5svg/qt5svg.mk | 39 +----------- package/qt5/qt5websockets/qt5websockets.mk | 39 +----------- package/qt5/qt5webview/qt5webview.mk | 39 +----------- package/qt5/qt5x11extras/qt5x11extras.mk | 20 +------ package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 31 +--------- 23 files changed, 23 insertions(+), 802 deletions(-) diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk index ecaff21efc..6f14d21fe7 100644 --- a/package/qextserialport/qextserialport.mk +++ b/package/qextserialport/qextserialport.mk @@ -16,24 +16,4 @@ endif QEXTSERIALPORT_DEPENDENCIES = qt5base -define QEXTSERIALPORT_CONFIGURE_CMDS - cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) $(QEXTSERIALPORT_CONF_OPTS) -endef - -define QEXTSERIALPORT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QEXTSERIALPORT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),y) -QEXTSERIALPORT_INSTALL_TARGET = NO -else -define QEXTSERIALPORT_INSTALL_TARGET_CMDS - cp -a $(@D)/*.so.* $(TARGET_DIR)/usr/lib -endef -endif - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index 7674b44558..eeb1b3644c 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -17,40 +17,4 @@ endif QT53D_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0 QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.GPLv3 LICENSE.LGPLv3 -define QT53D_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT53D_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT53D_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT53D_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/qt3d $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifeq ($(BR2_STATIC_LIBS),) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -# Available since 5.9 -define QT53D_INSTALL_TARGET_LATEST - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/geometryloaders $(TARGET_DIR)/usr/lib/qt/plugins - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/renderplugins $(TARGET_DIR)/usr/lib/qt/plugins -endef -endif -define QT53D_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sceneparsers $(TARGET_DIR)/usr/lib/qt/plugins - cp -dpfr $(STAGING_DIR)/usr/qml/Qt3D $(TARGET_DIR)/usr/qml - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml - $(QT53D_INSTALL_TARGET_LATEST) - $(QT53D_INSTALL_TARGET_EXAMPLES) -endef -endif - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.mk b/package/qt5/qt5canvas3d/qt5canvas3d.mk index b550ff00f2..711d0175d4 100644 --- a/package/qt5/qt5canvas3d/qt5canvas3d.mk +++ b/package/qt5/qt5canvas3d/qt5canvas3d.mk @@ -18,27 +18,4 @@ QT5CANVAS3D_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0 QT5CANVAS3D_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 endif -define QT5CANVAS3D_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5CANVAS3D_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5CANVAS3D_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5CANVAS3D_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/canvas3d $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5CANVAS3D_INSTALL_TARGET_CMDS - cp -dpfr $(STAGING_DIR)/usr/qml/QtCanvas3D $(TARGET_DIR)/usr/qml/ - $(QT5CANVAS3D_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index e359747503..40f5efc2da 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -24,42 +24,4 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5CHARTS_DEPENDENCIES += qt5declarative endif -define QT5CHARTS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5CHARTS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5CHARTS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5CHARTS_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Charts*.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins -endef -endif - -# this is only built with quick support enabled -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5CHARTS_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtCharts $(TARGET_DIR)/usr/qml/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5CHARTS_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/charts* $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5CHARTS_INSTALL_TARGET_CMDS - $(QT5CHARTS_INSTALL_TARGET_LIBS) - $(QT5CHARTS_INSTALL_TARGET_QMLS) - $(QT5CHARTS_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 0ade9876de..93a5099a99 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -25,61 +25,4 @@ QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5DECLARATIVE),qt5declarativ QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_BLUEZ5_UTILS),bluez5_utils) QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_NEARD),neard) -define QT5CONNECTIVITY_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5CONNECTIVITY_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5CONNECTIVITY_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -ifneq ($(BR2_PACKAGE_BLUEZ5_UTILS),) -define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtBluetooth $(TARGET_DIR)/usr/qml/ -endef -endif -ifeq ($(BR2_PACKAGE_NEARD),y) -define QT5CONNECTIVITY_INSTALL_TARGET_NFC_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtNfc $(TARGET_DIR)/usr/qml/ -endef -endif -endif - -ifneq ($(BR2_PACKAGE_BLUEZ5_UTILS),) -define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Bluetooth.so.* $(TARGET_DIR)/usr/lib - cp -dpf $(STAGING_DIR)/usr/bin/sdpscanner $(TARGET_DIR)/usr/bin -endef -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/bluetooth $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif -endif - -ifeq ($(BR2_PACKAGE_NEARD),y) -define QT5CONNECTIVITY_INSTALL_TARGET_NFC - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Nfc.so.* $(TARGET_DIR)/usr/lib -endef -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5CONNECTIVITY_INSTALL_TARGET_NFC_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/nfc $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif -endif - -define QT5CONNECTIVITY_INSTALL_TARGET_CMDS - $(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH) - $(QT5CONNECTIVITY_INSTALL_TARGET_NFC) - $(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS) - $(QT5CONNECTIVITY_INSTALL_TARGET_NFC_QMLS) - $(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_EXAMPLES) - $(QT5CONNECTIVITY_INSTALL_TARGET_NFC_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 6210611961..42c60ed3eb 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -18,49 +18,4 @@ QT5DECLARATIVE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1. QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL endif -define QT5DECLARATIVE_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5DECLARATIVE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5DECLARATIVE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib -endef -define QT5DECLARATIVE_INSTALL_TARGET_QUICK_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/quick/ $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5DECLARATIVE_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml* $(TARGET_DIR)/usr/lib/qt/plugins - $(QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS) -endef - -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5DECLARATIVE_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/qml* $(TARGET_DIR)/usr/lib/qt/examples/ - $(QT5DECLARATIVE_INSTALL_TARGET_QUICK_EXAMPLES) -endef -endif - -define QT5DECLARATIVE_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/bin/qml* $(TARGET_DIR)/usr/bin - cp -dpfr $(STAGING_DIR)/usr/qml $(TARGET_DIR)/usr - $(QT5DECLARATIVE_INSTALL_TARGET_EXAMPLES) - $(QT5DECLARATIVE_INSTALL_TARGET_LIBS) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5enginio/qt5enginio.mk b/package/qt5/qt5enginio/qt5enginio.mk index ebd99e4cb7..714f8c6b73 100644 --- a/package/qt5/qt5enginio/qt5enginio.mk +++ b/package/qt5/qt5enginio/qt5enginio.mk @@ -22,40 +22,4 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5ENGINIO_DEPENDENCIES += qt5declarative endif -define QT5ENGINIO_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5ENGINIO_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5ENGINIO_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5ENGINIO_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/Enginio $(TARGET_DIR)/usr/qml/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5ENGINIO_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/enginio $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifneq ($(BR2_STATIC_LIBS),y) -define QT5ENGINIO_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libEnginio.so.* $(TARGET_DIR)/usr/lib -endef -endif - -define QT5ENGINIO_INSTALL_TARGET_CMDS - $(QT5ENGINIO_INSTALL_TARGET_LIBS) - $(QT5ENGINIO_INSTALL_TARGET_QMLS) - $(QT5ENGINIO_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index c5011a94f0..92a3c1b8fb 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -18,20 +18,4 @@ QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or L QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL endif -define QT5GRAPHICALEFFECTS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5GRAPHICALEFFECTS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5GRAPHICALEFFECTS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -define QT5GRAPHICALEFFECTS_INSTALL_TARGET_CMDS - cp -dpfr $(STAGING_DIR)/usr/qml/QtGraphicalEffects $(TARGET_DIR)/usr/qml -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index fa13ebedaf..662215521c 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -18,22 +18,4 @@ QT5IMAGEFORMATS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL- QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL endif -define QT5IMAGEFORMATS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5IMAGEFORMATS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5IMAGEFORMATS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5IMAGEFORMATS_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/imageformats/*.so $(TARGET_DIR)/usr/lib/qt/plugins/imageformats/ -endef -endif - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index a69e8f41a6..8face619d8 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -22,51 +22,4 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif -define QT5LOCATION_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5LOCATION_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5LOCATION_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5LOCATION_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtPositioning $(TARGET_DIR)/usr/qml/ - cp -dpfr $(STAGING_DIR)/usr/qml/QtLocation $(TARGET_DIR)/usr/qml/ -endef -define QT5LOCATION_INSTALL_TARGET_LOCATION - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Location.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/geoservices $(TARGET_DIR)/usr/lib/qt/plugins/ -endef -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -define QT5LOCATION_INSTALL_TARGET_POSITION_QUICK - cp -dpf $(STAGING_DIR)/usr/lib/libQt5PositioningQuick.so.* $(TARGET_DIR)/usr/lib -endef -endif -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5LOCATION_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/location $(TARGET_DIR)/usr/lib/qt/examples/ - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/positioning $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif -endif - -define QT5LOCATION_INSTALL_TARGET_POSITION - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Positioning.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/position $(TARGET_DIR)/usr/lib/qt/plugins/ -endef - -define QT5LOCATION_INSTALL_TARGET_CMDS - $(QT5LOCATION_INSTALL_TARGET_POSITION) - $(QT5LOCATION_INSTALL_TARGET_POSITION_QUICK) - $(QT5LOCATION_INSTALL_TARGET_LOCATION) - $(QT5LOCATION_INSTALL_TARGET_QMLS) - $(QT5LOCATION_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index e598140a9a..a060490c62 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -34,53 +34,9 @@ ifeq ($(BR2_PACKAGE_ALSA_LIB),y) QT5MULTIMEDIA_DEPENDENCIES += alsa-lib endif -define QT5MULTIMEDIA_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5MULTIMEDIA_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5MULTIMEDIA_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -# since Qt5.10.1 libqgsttools was renamed to libQtMultimediaGstTools -# and is installed by the default target install step below -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)x$(BR2_PACKAGE_GST1_PLUGINS_BASE),xy) -define QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB - cp -dpf $(STAGING_DIR)/usr/lib/libqgsttools*.so.* $(TARGET_DIR)/usr/lib -endef -endif - -define QT5MULTIMEDIA_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Multimedia*.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins - $(QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB) -endef -endif # !BR2_STATIC_LIBS - -# this is only built with quick/opengl support enabled -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5_GL_AVAILABLE),yy) -define QT5MULTIMEDIA_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/ -endef -endif - ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5MULTIMEDIA_LICENSE += , LGPL-2.1+ (examples/multimedia/spectrum/3rdparty/fftreal) QT5MULTIMEDIA_LICENSE_FILES += examples/multimedia/spectrum/3rdparty/fftreal/license.txt -define QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/multimedia* $(TARGET_DIR)/usr/lib/qt/examples/ -endef endif -define QT5MULTIMEDIA_INSTALL_TARGET_CMDS - $(QT5MULTIMEDIA_INSTALL_TARGET_LIBS) - $(QT5MULTIMEDIA_INSTALL_TARGET_QMLS) - $(QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 3e0c5effb3..d6a0d2218c 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -18,43 +18,4 @@ else QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL endif -define QT5QUICKCONTROLS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5QUICKCONTROLS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5QUICKCONTROLS_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/quickcontrols $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5BASE_WIDGETS),yy) -define QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick -endef -endif - -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -define QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Layouts $(TARGET_DIR)/usr/qml/QtQuick -endef -endif - -define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick - $(QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS) - $(QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS) - $(QT5QUICKCONTROLS_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index c2004c2ee7..51d8b60741 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -13,42 +13,4 @@ QT5QUICKCONTROLS2_INSTALL_STAGING = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL -define QT5QUICKCONTROLS2_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5QUICKCONTROLS2_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/quickcontrols2 $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib - cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls.2 $(TARGET_DIR)/usr/qml/QtQuick - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick - $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) -endef -else -define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs - $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) -endef -endif - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index a3b8cb7e34..e2a1bb2812 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -27,33 +27,4 @@ QT5SCRIPT_LICENSE_FILES += \ src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB \ src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING -define QT5SCRIPT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5SCRIPT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5SCRIPT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5SCRIPT_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Script*.so.* $(TARGET_DIR)/usr/lib -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5SCRIPT_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/script $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5SCRIPT_INSTALL_TARGET_CMDS - $(QT5SCRIPT_INSTALL_TARGET_LIBS) - $(QT5SCRIPT_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index c0776314d5..b90ab01030 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -16,38 +16,4 @@ ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5SCXML_LICENSE += , BSD-3-Clause (examples) endif -define QT5SCXML_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5SCXML_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5SCXML_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5SCXML_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Scxml*.so.* $(TARGET_DIR)/usr/lib -endef -endif - -define QT5SCXML_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtScxml/ $(TARGET_DIR)/usr/qml/ -endef - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5SCXML_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/scxml $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5SCXML_INSTALL_TARGET_CMDS - $(QT5SCXML_INSTALL_TARGET_LIBS) - $(QT5SCXML_INSTALL_TARGET_QMLS) - $(QT5SCXML_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index 10498a4970..7a3c5b7ef5 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -22,41 +22,4 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarative endif -define QT5SENSORS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5SENSORS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5SENSORS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5SENSORS_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Sensors.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sensor* $(TARGET_DIR)/usr/lib/qt/plugins -endef -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5SENSORS_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtSensors $(TARGET_DIR)/usr/qml -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5SENSORS_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/sensors $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5SENSORS_INSTALL_TARGET_CMDS - $(QT5SENSORS_INSTALL_TARGET_LIBS) - $(QT5SENSORS_INSTALL_TARGET_QMLS) - $(QT5SENSORS_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index be8bb8b23c..0ee351afe2 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -13,39 +13,4 @@ QT5SERIALBUS_INSTALL_STAGING = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL -define QT5SERIALBUS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5SERIALBUS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5SERIALBUS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5SERIALBUS_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5SerialBus.so.* \ - $(TARGET_DIR)/usr/lib - mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/canbus - cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/canbus/*.so \ - $(TARGET_DIR)/usr/lib/qt/plugins/canbus -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES)$(BR2_PACKAGE_QT5BASE_WIDGETS),yy) -define QT5SERIALBUS_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/serialbus $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5SERIALBUS_INSTALL_TARGET_CMDS - $(QT5SERIALBUS_INSTALL_TARGET_LIBS) - $(QT5SERIALBUS_INSTALL_TARGET_EXAMPLES) - $(INSTALL) -m 0755 -D $(@D)/bin/canbusutil \ - $(TARGET_DIR)/usr/bin/canbusutil -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 5c2abd82da..f08fac6002 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -18,33 +18,4 @@ QT5SERIALPORT_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3. QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL endif -define QT5SERIALPORT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5SERIALPORT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5SERIALPORT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5SERIALPORT_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5SerialPort.so.* $(TARGET_DIR)/usr/lib -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5SERIALPORT_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/serialport $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5SERIALPORT_INSTALL_TARGET_CMDS - $(QT5SERIALPORT_INSTALL_TARGET_LIBS) - $(QT5SERIALPORT_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index cb91844efd..2d8dade407 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -18,41 +18,4 @@ QT5SVG_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL endif -define QT5SVG_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5SVG_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5SVG_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) -define QT5SVG_INSTALL_ICONENGINES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/iconengines $(TARGET_DIR)/usr/lib/qt/plugins -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5SVG_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/svg $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifeq ($(BR2_STATIC_LIBS),) -define QT5SVG_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Svg*.so.* $(TARGET_DIR)/usr/lib - cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/imageformats/libqsvg.so $(TARGET_DIR)/usr/lib/qt/plugins/imageformats/ - $(QT5SVG_INSTALL_ICONENGINES) -endef -endif - -define QT5SVG_INSTALL_TARGET_CMDS - $(QT5SVG_INSTALL_TARGET_LIBS) - $(QT5SVG_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index 6e734a3bf3..0647ade615 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -25,41 +25,4 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5WEBSOCKETS_DEPENDENCIES += qt5declarative endif -define QT5WEBSOCKETS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5WEBSOCKETS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5WEBSOCKETS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5WEBSOCKETS_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/WebSockets $(TARGET_DIR)/usr/qml/Qt/ - cp -dpfr $(STAGING_DIR)/usr/qml/QtWebSockets $(TARGET_DIR)/usr/qml/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5WEBSOCKETS_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/websockets $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifneq ($(BR2_STATIC_LIBS),y) -define QT5WEBSOCKETS_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebSockets.so.* $(TARGET_DIR)/usr/lib -endef -endif - -define QT5WEBSOCKETS_INSTALL_TARGET_CMDS - $(QT5WEBSOCKETS_INSTALL_TARGET_LIBS) - $(QT5WEBSOCKETS_INSTALL_TARGET_QMLS) - $(QT5WEBSOCKETS_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index 0a80dba612..db4813563a 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -16,41 +16,4 @@ ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) endif -define QT5WEBVIEW_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5WEBVIEW_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5WEBVIEW_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5WEBVIEW_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtWebView $(TARGET_DIR)/usr/qml/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5WEBVIEW_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/webview $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifneq ($(BR2_STATIC_LIBS),y) -define QT5WEBVIEW_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebView.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/webview $(TARGET_DIR)/usr/lib/qt/plugins -endef -endif - -define QT5WEBVIEW_INSTALL_TARGET_CMDS - $(QT5WEBVIEW_INSTALL_TARGET_LIBS) - $(QT5WEBVIEW_INSTALL_TARGET_QMLS) - $(QT5WEBVIEW_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 6acc9462c1..8590f543c6 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -18,22 +18,4 @@ QT5X11EXTRAS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0 QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL endif -define QT5X11EXTRAS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5X11EXTRAS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5X11EXTRAS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5X11EXTRAS_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5X11Extras.so.* $(TARGET_DIR)/usr/lib -endef -endif - -$(eval $(generic-package)) +$(eval $(qmake-package)) diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 6ed247fd59..0a12bf6bdc 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -21,33 +21,4 @@ ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5XMLPATTERNS_LICENSE += , BSD-3-Clause (examples) endif -define QT5XMLPATTERNS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5XMLPATTERNS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5XMLPATTERNS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5XMLPATTERNS_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5XmlPatterns*.so.* $(TARGET_DIR)/usr/lib -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/xmlpatterns $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5XMLPATTERNS_INSTALL_TARGET_CMDS - $(QT5XMLPATTERNS_INSTALL_TARGET_LIBS) - $(QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) From patchwork Mon Feb 17 21:23:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239589 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48LxtD4gMYz9sRG for ; Tue, 18 Feb 2020 08:28:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2C07C840B5; Mon, 17 Feb 2020 21:28:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OU6iPZ--AGWG; Mon, 17 Feb 2020 21:28:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8700F8577F; Mon, 17 Feb 2020 21:28:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id CEFE21BF37B for ; Mon, 17 Feb 2020 21:28:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CAB6F86887 for ; Mon, 17 Feb 2020 21:28:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ys6V7kzQDNUE for ; Mon, 17 Feb 2020 21:28:11 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by hemlock.osuosl.org (Postfix) with ESMTPS id F15E186864 for ; Mon, 17 Feb 2020 21:28:10 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 9D868B902403; Mon, 17 Feb 2020 22:28:08 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:26 +0100 Message-Id: <20200217212350.29750-5-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 04/28] package/qt5base: Convert to qmake infra X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Convert build, staging and target install to the qmake infra commands. This removes a lot of conditional code because we solely rely on all install rules being properly generated according to the configured options. Of course we keep the configure command/logic as is, because qmake does not yet exist. Handling of the custom qt.conf is now done in the post staging hook. Todo: Check if font install for 5.6 is still working. Signed-off-by: Andreas Naumann --- package/qt5/qt5base/qt5base.mk | 81 +--------------------------------- 1 file changed, 2 insertions(+), 79 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index c662921b8f..03f984ef8c 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -286,33 +286,6 @@ else QT5BASE_CONFIGURE_OPTS += -no-journald endif -# Build the list of libraries to be installed on the target -QT5BASE_INSTALL_LIBS_y += Qt5Core -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XCB) += Qt5XcbQpa -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_CONCURRENT) += Qt5Concurrent -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFSDeviceIntegration -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFsKmsSupport -endif -ifeq ($(BR2_PACKAGE_GCNANO_BINARIES),y) -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFsKmsSupport -endif -else -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration -endif - -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport - -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus - ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) # use vivante backend @@ -379,10 +352,6 @@ define QT5BASE_CONFIGURE_CMDS ) endef -define QT5BASE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - # The file "qt.conf" can be used to override the hard-coded paths that are # compiled into the Qt library. We need it to make "qmake" relocatable. define QT5BASE_INSTALL_QT_CONF @@ -390,52 +359,6 @@ define QT5BASE_INSTALL_QT_CONF $(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf endef -define QT5BASE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5BASE_INSTALL_QT_CONF) -endef - -define QT5BASE_INSTALL_TARGET_LIBS - for lib in $(QT5BASE_INSTALL_LIBS_y); do \ - cp -dpf $(STAGING_DIR)/usr/lib/lib$${lib}.so.* $(TARGET_DIR)/usr/lib || exit 1 ; \ - done -endef - -define QT5BASE_INSTALL_TARGET_PLUGINS - if [ -d $(STAGING_DIR)/usr/lib/qt/plugins/ ] ; then \ - mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins ; \ - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins ; \ - fi -endef - -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -define QT5BASE_INSTALL_TARGET_FONTS - if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \ - mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \ - cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \ - fi -endef -endif - -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_STATIC_LIBS),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 +QT5BASE_POST_INSTALL_STAGING_HOOKS += QT5BASE_INSTALL_QT_CONF -$(eval $(generic-package)) +$(eval $(qmake-package)) From patchwork Mon Feb 17 21:23:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239594 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48LxtP104Wz9sRG for ; Tue, 18 Feb 2020 08:28:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 187F386CAC; Mon, 17 Feb 2020 21:28:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ppo0siAeyYoU; Mon, 17 Feb 2020 21:28:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3230486887; Mon, 17 Feb 2020 21:28:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id BFE131BF37B for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BC88E2048D for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LXW2motxt7Xj for ; Mon, 17 Feb 2020 21:28:10 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by silver.osuosl.org (Postfix) with ESMTPS id BC01620002 for ; Mon, 17 Feb 2020 21:28:10 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id F1F1DB90278E; Mon, 17 Feb 2020 22:28:08 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:27 +0100 Message-Id: <20200217212350.29750-6-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 05/28] package/qwt: Partially convert to qmake infra X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Use the qmake infra CONFIGURE and BUILD generic but keep the manipulation of qwtconfig.pri as PRE_CONFIGURE_HOOK as well as the custom install steps. Signed-off-by: Andreas Naumann --- package/qwt/qwt.mk | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index e0ffec765f..1fec17b19a 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -41,14 +41,11 @@ else QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtDll.*$$/QWT_CONFIG += QwtDll/' endif -define QWT_CONFIGURE_CMDS +define QWT_PRE_CONFIGURE_CMD $(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef -define QWT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef +QWT_PRE_CONFIGURE_HOOKS += QWT_PRE_CONFIGURE_CMD # After installation, we fixup the INSTALL_PREFIX in qwtconfig.pri so # that when building with qmake, -L$(STAGING_DIR)/usr/lib is used and @@ -64,4 +61,4 @@ define QWT_INSTALL_TARGET_CMDS rm -Rf $(TARGET_DIR)/usr/mkspecs endef -$(eval $(generic-package)) +$(eval $(qmake-package)) From patchwork Mon Feb 17 21:23:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239592 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48LxtL5NXHz9sRY for ; Tue, 18 Feb 2020 08:28:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 70F66204BC; Mon, 17 Feb 2020 21:28:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bC4f4WgXyT1w; Mon, 17 Feb 2020 21:28:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 92FF72049D; Mon, 17 Feb 2020 21:28:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 6EA6F1BF37B for ; Mon, 17 Feb 2020 21:28:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 69608857C1 for ; Mon, 17 Feb 2020 21:28:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q3vyu2kjjk11 for ; Mon, 17 Feb 2020 21:28:11 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 2DBA7840B5 for ; Mon, 17 Feb 2020 21:28:11 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 591D4B9027A2; Mon, 17 Feb 2020 22:28:09 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:28 +0100 Message-Id: <20200217212350.29750-7-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 06/28] package/qwt: Add missing qt5svg dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Andreas Naumann --- package/qwt/qwt.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index 1fec17b19a..50df7e2642 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -19,6 +19,7 @@ QWT_CONFIG += -e 's%/features%/mkspecs/features%' ifeq ($(BR2_PACKAGE_QWT_SVG),y) QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/QWT_CONFIG += QwtSvg/' +QWT_DEPENDENCIES += qt5svg else QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/\# QWT_CONFIG += QwtSvg/' endif From patchwork Mon Feb 17 21:23:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239590 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48LxtJ3LqCz9sRY for ; Tue, 18 Feb 2020 08:28:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1041B85BBA; Mon, 17 Feb 2020 21:28:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cEBr8VFcFurw; Mon, 17 Feb 2020 21:28:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A962A85421; Mon, 17 Feb 2020 21:28:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 73CF41BF963 for ; Mon, 17 Feb 2020 21:28:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6D77586CF0 for ; Mon, 17 Feb 2020 21:28:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 36yoVQJujXPV for ; Mon, 17 Feb 2020 21:28:11 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by hemlock.osuosl.org (Postfix) with ESMTPS id 9A1CA86887 for ; Mon, 17 Feb 2020 21:28:11 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id B84E4B9019C0; Mon, 17 Feb 2020 22:28:09 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:29 +0100 Message-Id: <20200217212350.29750-8-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 07/28] package/qt5tools: Partially convert to qmake infra X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Use generic configure command but for now keep custom build and install logic. Signed-off-by: Andreas Naumann --- package/qt5/qt5tools/qt5tools.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index 0d00022998..8e06706dd6 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -50,10 +50,6 @@ QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPATHS) += qtpaths QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo -define QT5TOOLS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - define QT5TOOLS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) sub-src-qmake_all $(foreach p,$(QT5TOOLS_BUILD_DIRS_y), \ @@ -71,4 +67,4 @@ define QT5TOOLS_INSTALL_TARGET_CMDS $(INSTALL) -D -m0755 $(@D)/bin/$(p) $(TARGET_DIR)/usr/bin/$(p)$(sep)) endef -$(eval $(generic-package)) +$(eval $(qmake-package)) From patchwork Mon Feb 17 21:23:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239599 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48LxtV11rbz9sRJ for ; Tue, 18 Feb 2020 08:28:34 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 494E8204B4; Mon, 17 Feb 2020 21:28:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dM3NvBIajpxV; Mon, 17 Feb 2020 21:28:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id C39BD204A8; Mon, 17 Feb 2020 21:28:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 62D451BF37B for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5B2EB86887 for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9fNur2XO+Y5I for ; Mon, 17 Feb 2020 21:28:12 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by hemlock.osuosl.org (Postfix) with ESMTPS id EA5A486CAC for ; Mon, 17 Feb 2020 21:28:11 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 2F9AEB901E25; Mon, 17 Feb 2020 22:28:10 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:30 +0100 Message-Id: <20200217212350.29750-9-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 08/28] package/qt5virtualkeyboard: Convert to qmake infra X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" It seems the old method was missing some files from the install step since after the conversion the the following additional files appear in target after a build with all config options selected: usr/lib/qt/plugins/lipi_toolkit/libactivedtw.so usr/lib/qt/plugins/lipi_toolkit/libboxfld.so usr/lib/qt/plugins/lipi_toolkit/libl7.so usr/lib/qt/plugins/lipi_toolkit/liblipiengine.so usr/lib/qt/plugins/lipi_toolkit/liblogger.so usr/lib/qt/plugins/lipi_toolkit/libneuralnet.so usr/lib/qt/plugins/lipi_toolkit/libnn.so usr/lib/qt/plugins/lipi_toolkit/libnpen.so usr/lib/qt/plugins/lipi_toolkit/libpointfloat.so usr/lib/qt/plugins/lipi_toolkit/libpreproc.so usr/lib/qt/plugins/lipi_toolkit/libsubstroke.so usr/lib/qt/plugins/virtualkeyboard/libqtvirtualkeyboard_lipi.so Signed-off-by: Andreas Naumann --- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 63 ++----------------- 1 file changed, 4 insertions(+), 59 deletions(-) diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index c13fa699a6..162ed88c8c 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -22,7 +22,7 @@ endif QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS = $(call qstrip,$(BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)) ifneq ($(strip $(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) -QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS),lang-$(lang))" +QT5VIRTUALKEYBOARD_CONF_OPTS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS),lang-$(lang))" ifneq ($(filter ja_JP all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (openwnn) @@ -36,7 +36,6 @@ endif ifneq ($(filter zh_CN all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (pinyin) ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/pinyin/NOTICE else QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/pinyin/3rdparty/pinyin/NOTICE @@ -46,7 +45,6 @@ endif ifneq ($(filter zh_TW all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (tcime), BSD-3-Clause (tcime) ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/tcime/COPYING else QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/tcime/3rdparty/tcime/COPYING @@ -55,8 +53,7 @@ endif endif ifeq ($(BR2_PACKAGE_QT5VIRTUALKEYBOARD_HANDWRITING),y) -QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES -QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+=handwriting +QT5VIRTUALKEYBOARD_CONF_OPTS += CONFIG+=handwriting QT5VIRTUALKEYBOARD_LICENSE += , MIT (lipi-toolkit) ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/lipi-toolkit/license.txt @@ -66,59 +63,7 @@ endif endif ifeq ($(BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION),y) -QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+=arrow-key-navigation +QT5VIRTUALKEYBOARD_CONF_OPTS += CONFIG+=arrow-key-navigation endif -ifeq ($(QT5VIRTUALKEYBOARD_3RDPARTY_PARTS),YES) -define QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS - cp -dpfr $(STAGING_DIR)/usr/qtvirtualkeyboard $(TARGET_DIR)/usr -endef -endif - -define QT5VIRTUALKEYBOARD_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake $(QT5VIRTUALKEYBOARD_QMAKEFLAGS)) -endef - -define QT5VIRTUALKEYBOARD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5VIRTUALKEYBOARD_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML - mkdir -p $(TARGET_DIR)/usr/qml/QtQuick/Enterprise - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Enterprise/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick/Enterprise/ -endef -else -define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML - mkdir -p $(TARGET_DIR)/usr/qml/QtQuick - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/virtualkeyboard $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST):$(BR2_STATIC_LIBS),y:) -define QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5VirtualKeyboard*.so.* $(TARGET_DIR)/usr/lib -endef -endif - -define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so \ - $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts - $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS) - $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML) - $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS) - $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) From patchwork Mon Feb 17 21:23:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239593 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48LxtL4GYLz9sRJ for ; Tue, 18 Feb 2020 08:28:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 68B2285A22; Mon, 17 Feb 2020 21:28:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pFx0Gkup7M5q; Mon, 17 Feb 2020 21:28:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id C6B0A858F5; Mon, 17 Feb 2020 21:28:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2231D1BF37B for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1ED4F20494 for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id P03fSNWW2dOb for ; Mon, 17 Feb 2020 21:28:12 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by silver.osuosl.org (Postfix) with ESMTPS id 7A8182048D for ; Mon, 17 Feb 2020 21:28:12 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 7FB43B9027AC; Mon, 17 Feb 2020 22:28:10 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:31 +0100 Message-Id: <20200217212350.29750-10-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 09/28] package/quazip: Convert to qmake infra X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" We need to use correct staging path as prefix after switching to qmake infra, because the qmake infra no longer overwrites the built in install pathes. Otherwise the build breaks when the install steps are trying to copy to /usr. Signed-off-by: Andreas Naumann --- package/quazip/quazip.mk | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/package/quazip/quazip.mk b/package/quazip/quazip.mk index 53042f6c4c..35cf8adafd 100644 --- a/package/quazip/quazip.mk +++ b/package/quazip/quazip.mk @@ -13,20 +13,6 @@ QUAZIP_DEPENDENCIES = \ QUAZIP_LICENSE = LGPL-2.1 QUAZIP_LICENSE_FILES = COPYING -define QUAZIP_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) PREFIX=/usr) -endef +QUAZIP_CONF_OPTS = PREFIX=$(STAGING_DIR)/usr -define QUAZIP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QUAZIP_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(STAGING_DIR) -endef - -define QUAZIP_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(TARGET_DIR) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) From patchwork Mon Feb 17 21:23:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239600 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48LxtW0KM4z9sRY for ; Tue, 18 Feb 2020 08:28:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0794B8700D; Mon, 17 Feb 2020 21:28:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BvRNA+CzFNfa; Mon, 17 Feb 2020 21:28:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3DF6C87100; Mon, 17 Feb 2020 21:28:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 620BB1BF963 for ; Mon, 17 Feb 2020 21:28:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5B8FA853C5 for ; Mon, 17 Feb 2020 21:28:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IHcPLJYveWey for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0E24E84D49 for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 12551B90207F; Mon, 17 Feb 2020 22:28:11 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:32 +0100 Message-Id: <20200217212350.29750-11-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 10/28] package/qt5wayland: Convert to qmake infra X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Straightforward conversion except for the wayland-compositor configure option. Signed-off-by: Andreas Naumann --- package/qt5/qt5wayland/qt5wayland.mk | 56 +--------------------------- 1 file changed, 2 insertions(+), 54 deletions(-) diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 4790efc660..b98a28b5c8 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -27,59 +27,7 @@ QT5WAYLAND_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICE endif ifeq ($(BR2_PACKAGE_QT5WAYLAND_COMPOSITOR),y) -QT5WAYLAND_QMAKEFLAGS += CONFIG+=wayland-compositor +QT5WAYLAND_CONF_OPTS += CONFIG+=wayland-compositor endif -define QT5WAYLAND_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake $(QT5WAYLAND_QMAKEFLAGS)) -endef - -define QT5WAYLAND_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5WAYLAND_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5WAYLAND_COMPOSITOR),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -define QT5WAYLAND_INSTALL_COMPOSITOR - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandCompositor.so* $(TARGET_DIR)/usr/lib -endef -else -define QT5WAYLAND_INSTALL_COMPOSITOR - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Compositor.so* $(TARGET_DIR)/usr/lib -endef -endif -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5_VERSION_LATEST),yy) -define QT5WAYLAND_INSTALL_COMPOSITOR_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtWayland $(TARGET_DIR)/usr/qml/ -endef -endif -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL),y) -define QT5WAYLAND_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/wayland $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif -else -define QT5WAYLAND_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/wayland $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif -endif - -define QT5WAYLAND_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandClient.so* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/wayland* $(TARGET_DIR)/usr/lib/qt/plugins - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforms/libqwayland* $(TARGET_DIR)/usr/lib/qt/plugins/platforms - $(QT5WAYLAND_INSTALL_COMPOSITOR) - $(QT5WAYLAND_INSTALL_COMPOSITOR_QMLS) - $(QT5WAYLAND_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) From patchwork Mon Feb 17 21:23:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239596 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48LxtQ156Fz9sRY for ; Tue, 18 Feb 2020 08:28:30 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9387E858DA; Mon, 17 Feb 2020 21:28:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8TxDG5qTD_Wh; Mon, 17 Feb 2020 21:28:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5DB3685A49; Mon, 17 Feb 2020 21:28:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E16A41BF963 for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DB70886887 for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KT6iC032SjDR for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by hemlock.osuosl.org (Postfix) with ESMTPS id 3832586864 for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 69C08B90278E; Mon, 17 Feb 2020 22:28:11 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:33 +0100 Message-Id: <20200217212350.29750-12-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 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 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The install of the javascript is custom and thus needs to be kept. Signed-off-by: Andreas Naumann --- package/qt5/qt5webchannel/qt5webchannel.mk | 39 ++-------------------- 1 file changed, 2 insertions(+), 37 deletions(-) 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)) From patchwork Mon Feb 17 21:23:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239598 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48LxtT5y4hz9sRG for ; Tue, 18 Feb 2020 08:28:33 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1D963204C6; Mon, 17 Feb 2020 21:28:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8FdNgI+LZxOU; Mon, 17 Feb 2020 21:28:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 4439B204B8; Mon, 17 Feb 2020 21:28:26 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 271B11BF37B for ; Mon, 17 Feb 2020 21:28:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2421F85660 for ; Mon, 17 Feb 2020 21:28:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qo_EMhT45UL0 for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 844B28586A for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id C20F8B902403; Mon, 17 Feb 2020 22:28:11 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:34 +0100 Message-Id: <20200217212350.29750-13-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 12/28] package/qt5webkit: Convert to qmake infra X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Mostly straightforward conversion. The jsc binary was not installed automatically. Unsure of its significance the custom install command is kept in a hook. Note: The generic install creates QtWebProcess in /usr/libexec/ instead of /usr/bin. Signed-off-by: Andreas Naumann --- package/qt5/qt5webkit/qt5webkit.mk | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 25c5495482..f20fa24b9c 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -37,35 +37,20 @@ endif # QtWebkit's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBKIT_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBKIT_CONF_ENV = PATH=$(@D)/host-bin:$(BR_PATH) +QT5WEBKIT_MAKE_ENV = PATH=$(@D)/host-bin:$(BR_PATH) define QT5WEBKIT_PYTHON2_SYMLINK mkdir -p $(@D)/host-bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python endef QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK -define QT5WEBKIT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/bin/qmake WEBKIT_CONFIG+=use_system_leveldb) -endef - -define QT5WEBKIT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(MAKE) -C $(@D) -endef - -define QT5WEBKIT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(MAKE) -C $(@D) install -endef +QT5WEBKIT_CONF_OPTS = WEBKIT_CONFIG+=use_system_leveldb -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5WEBKIT_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtWebKit $(TARGET_DIR)/usr/qml/ -endef -endif - -define QT5WEBKIT_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebKit*.so.* $(TARGET_DIR)/usr/lib +define QT5WEBKIT_INSTALL_TARGET_EXTRAS cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/ - $(QT5WEBKIT_INSTALL_TARGET_QMLS) endef -$(eval $(generic-package)) +QT5WEBKIT_POST_INSTALL_TARGET_HOOKS += QT5WEBKIT_INSTALL_TARGET_EXTRAS + +$(eval $(qmake-package)) From patchwork Mon Feb 17 21:23:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239597 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48LxtQ5Rpcz9sRt for ; Tue, 18 Feb 2020 08:28:30 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9F53186864; Mon, 17 Feb 2020 21:28:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ViaNlO8mmctA; Mon, 17 Feb 2020 21:28:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B05DF86CF0; Mon, 17 Feb 2020 21:28:27 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 5E1941BF37B for ; Mon, 17 Feb 2020 21:28:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 596858565B for ; Mon, 17 Feb 2020 21:28:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IVb44pyYvUbM for ; Mon, 17 Feb 2020 21:28:14 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by fraxinus.osuosl.org (Postfix) with ESMTPS id D57E185868 for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 21E9DB9019C0; Mon, 17 Feb 2020 22:28:12 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:35 +0100 Message-Id: <20200217212350.29750-14-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 13/28] package/qt5webkit-examples: Convert to qmake infra X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Straightforward conversion. Only conditional dependencies have to remain. Signed-off-by: Andreas Naumann --- .../qt5webkit-examples/qt5webkit-examples.mk | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk index 94153fd652..1f6058657d 100644 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk @@ -26,29 +26,8 @@ ifeq ($(BR2_PACKAGE_QT5XMLPATTERNS),y) QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5xmlpatterns endif -define QT5WEBKIT_EXAMPLES_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5WEBKIT_EXAMPLES_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5WEBKIT_EXAMPLES_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5declarative -define QT5WEBKIT_EXAMPLES_INSTALL_QML - cp -dpfr $(@D)/examples/webkitqml $(TARGET_DIR)/usr/lib/qt/examples -endef endif -define QT5WEBKIT_EXAMPLES_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/lib/qt/examples - cp -dpfr $(@D)/examples/webkitwidgets $(TARGET_DIR)/usr/lib/qt/examples - $(QT5WEBKIT_EXAMPLES_INSTALL_QML) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package)) From patchwork Mon Feb 17 21:23:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239601 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48LxtX05D6z9sRG for ; Tue, 18 Feb 2020 08:28:36 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 69898853E6; Mon, 17 Feb 2020 21:28:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id W9VwbCnVY6ET; Mon, 17 Feb 2020 21:28:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 880DF853C5; Mon, 17 Feb 2020 21:28:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 35F031BF37B for ; Mon, 17 Feb 2020 21:28:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3247420494 for ; Mon, 17 Feb 2020 21:28:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8r8oPyrMSEua for ; Mon, 17 Feb 2020 21:28:14 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by silver.osuosl.org (Postfix) with ESMTPS id 3EF5520002 for ; Mon, 17 Feb 2020 21:28:14 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 727F1B901E25; Mon, 17 Feb 2020 22:28:12 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:36 +0100 Message-Id: <20200217212350.29750-15-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 14/28] package/qt5webengine: Convert to qmake infra X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Mostly straightforward conversion but keeping custom config/build env to apply the python2 workaround. Signed-off-by: Andreas Naumann --- package/qt5/qt5webengine/qt5webengine.mk | 47 +++--------------------- 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 1d5ee8d819..798b777df0 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -30,16 +30,16 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss endif -QT5WEBENGINE_QMAKEFLAGS += WEBENGINE_CONFIG+=use_system_ffmpeg +QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) -QT5WEBENGINE_QMAKEFLAGS += WEBENGINE_CONFIG+=use_proprietary_codecs +QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_proprietary_codecs endif ifeq ($(BR2_PACKAGE_QT5WEBENGINE_ALSA),y) QT5WEBENGINE_DEPENDENCIES += alsa-lib else -QT5WEBENGINE_QMAKEFLAGS += QT_CONFIG-=alsa +QT5WEBENGINE_CONF_OPTS += QT_CONFIG-=alsa endif # QtWebengine's build system uses python, but only supports python2. We work @@ -63,42 +63,7 @@ QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config endif -define QT5WEBENGINE_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBENGINE_ENV) $(HOST_DIR)/bin/qmake $(QT5WEBENGINE_QMAKEFLAGS)) -endef - -define QT5WEBENGINE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(QT5WEBENGINE_ENV) $(MAKE) -C $(@D) -endef - -define QT5WEBENGINE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(QT5WEBENGINE_ENV) $(MAKE) -C $(@D) install -endef - -define QT5WEBENGINE_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtWebEngine $(TARGET_DIR)/usr/qml/ -endef - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5WEBENGINE_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/webengine* $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifneq ($(BR2_STATIC_LIBS),y) -define QT5WEBENGINE_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebEngine*.so.* $(TARGET_DIR)/usr/lib - cp -dpf $(STAGING_DIR)/usr/libexec/QtWebEngineProcess $(TARGET_DIR)/usr/libexec/ - cp -dpfr $(STAGING_DIR)/usr/resources/ $(TARGET_DIR)/usr/ - mkdir -p $(TARGET_DIR)/usr/translations/qtwebengine_locales/ - cp -dpfr $(STAGING_DIR)/usr/translations/qtwebengine_locales $(TARGET_DIR)/usr/translations/qtwebengine_locales/ -endef -endif - -define QT5WEBENGINE_INSTALL_TARGET_CMDS - $(QT5WEBENGINE_INSTALL_TARGET_LIBS) - $(QT5WEBENGINE_INSTALL_TARGET_QMLS) - $(QT5WEBENGINE_INSTALL_TARGET_EXAMPLES) -endef +QT5WEBENGINE_CONF_ENV = $(QT5WEBENGINE_ENV) +QT5WEBENGINE_MAKE_ENV = $(QT5WEBENGINE_ENV) -$(eval $(generic-package)) +$(eval $(qmake-package)) From patchwork Mon Feb 17 21:23:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239602 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48LxtZ60J3z9sRG for ; Tue, 18 Feb 2020 08:28:38 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 602EF86EC8; Mon, 17 Feb 2020 21:28:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 81Ez0eLTSGqB; Mon, 17 Feb 2020 21:28:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BA38187100; Mon, 17 Feb 2020 21:28:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 639E91BF963 for ; Mon, 17 Feb 2020 21:28:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6089A20002 for ; Mon, 17 Feb 2020 21:28:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7QCybOPF6Mn6 for ; Mon, 17 Feb 2020 21:28:14 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by silver.osuosl.org (Postfix) with ESMTPS id 9884E2048D for ; Mon, 17 Feb 2020 21:28:14 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id CBE6FB9027A2; Mon, 17 Feb 2020 22:28:12 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:37 +0100 Message-Id: <20200217212350.29750-16-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 15/28] package/qt-webkit-kiosk: Convert to qmake infra X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Convert but keep the slightly complicated custom install step for now. Signed-off-by: Andreas Naumann --- package/qt-webkit-kiosk/qt-webkit-kiosk.mk | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/package/qt-webkit-kiosk/qt-webkit-kiosk.mk b/package/qt-webkit-kiosk/qt-webkit-kiosk.mk index a714fca9c9..22cbf3cb87 100644 --- a/package/qt-webkit-kiosk/qt-webkit-kiosk.mk +++ b/package/qt-webkit-kiosk/qt-webkit-kiosk.mk @@ -11,13 +11,8 @@ QT_WEBKIT_KIOSK_DEPENDENCIES = qt5webkit qt5multimedia QT_WEBKIT_KIOSK_LICENSE = LGPL-3.0 QT_WEBKIT_KIOSK_LICENSE_FILES = doc/lgpl.html -define QT_WEBKIT_KIOSK_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) PREFIX=/usr) -endef - -define QT_WEBKIT_KIOSK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef +QT_WEBKIT_KIOSK_INSTALL_STAGING = NO +QT_WEBKIT_KIOSK_CONF_OPTS = PREFIX=/usr define QT_WEBKIT_KIOSK_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src -f Makefile.qt-webkit-kiosk \ @@ -29,4 +24,4 @@ define QT_WEBKIT_KIOSK_INSTALL_TARGET_CMDS $(if $(BR2_PACKAGE_QT_WEBKIT_KIOSK_SOUNDS),install_sound) endef -$(eval $(generic-package)) +$(eval $(qmake-package)) From patchwork Mon Feb 17 21:23:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239604 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Lxtg6M1Pz9sRY for ; Tue, 18 Feb 2020 08:28:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 43DAB20494; Mon, 17 Feb 2020 21:28:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3k04-OFQtn6r; Mon, 17 Feb 2020 21:28:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 1DFB4204A5; Mon, 17 Feb 2020 21:28:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 98F111BF37B for ; Mon, 17 Feb 2020 21:28:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 94A8985660 for ; Mon, 17 Feb 2020 21:28:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id O6EPYn2nfU0l for ; Mon, 17 Feb 2020 21:28:15 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 19FA18565B for ; Mon, 17 Feb 2020 21:28:15 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 356F6B9027AC; Mon, 17 Feb 2020 22:28:13 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:38 +0100 Message-Id: <20200217212350.29750-17-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 16/28] package/qt5cinex: Convert to qmake infra X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Keep custom install logic because qt5cinex has no built-in install target. Signed-off-by: Andreas Naumann --- package/qt5cinex/qt5cinex.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/package/qt5cinex/qt5cinex.mk b/package/qt5cinex/qt5cinex.mk index 89c38ee3f5..2b27f651d8 100644 --- a/package/qt5cinex/qt5cinex.mk +++ b/package/qt5cinex/qt5cinex.mk @@ -17,13 +17,6 @@ QT5CINEX_DEPENDENCIES = qt5base qt5declarative QT5CINEX_LICENSE = CC-BY-3.0 QT5CINEX_LICENSE_FILES = README -define QT5CINEX_CONFIGURE_CMDS - cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake -endef - -define QT5CINEX_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef # In addition to the Cinematic Experience itself, we also install a # wrapper shell script to /usr/bin: the Cinematic Experience binary @@ -39,4 +32,4 @@ define QT5CINEX_INSTALL_TARGET_CMDS $(TARGET_DIR)/usr/bin/CinematicExperience-demo endef -$(eval $(generic-package)) +$(eval $(qmake-package)) From patchwork Mon Feb 17 21:23:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239603 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Lxtg0cVpz9sRJ for ; Tue, 18 Feb 2020 08:28:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 68AED8700E; Mon, 17 Feb 2020 21:28:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Gdd0ZMp6FTyD; Mon, 17 Feb 2020 21:28:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 8D1A087100; Mon, 17 Feb 2020 21:28:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1FC6C1BF37B for ; Mon, 17 Feb 2020 21:28:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1CD4D84D49 for ; Mon, 17 Feb 2020 21:28:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Lq1W-eRNpyAf for ; Mon, 17 Feb 2020 21:28:15 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by whitealder.osuosl.org (Postfix) with ESMTPS id 72484853C5 for ; Mon, 17 Feb 2020 21:28:15 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id A3544B90207F; Mon, 17 Feb 2020 22:28:13 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:39 +0100 Message-Id: <20200217212350.29750-18-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 17/28] core/pkg-infra: Fix package file statistics for parallel build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When activating top level parallel build, multiple processes may try to modify the various *files-list* files in the common build/ directory at the same time. This can cause racy build failures. The fix here is to use flock to ensure exclusive execution of the statistics gathering code. For this to work it is assumed that the target/staging/host directories are isolated, which is true for per-package builds. For standard sequential builds, the locking is of course unnecessary but no conditional handling is implemented since the runtime cost is expected to be next to nothing. For flock to work, the statistics gathering code must be run in a single subshell. Otherwise the lockfile descriptor would be closed after the subshell (= the Makefile line where it was opened) ends and thus the lock would be released before even entering the critical code section. Signed-off-by: Andreas Naumann --- package/pkg-generic.mk | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 268d999efb..d18805e2d0 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -64,20 +64,22 @@ GLOBAL_INSTRUMENTATION_HOOKS += step_time # $(3): suffix of file (optional) define step_pkg_size_inner @touch $(BUILD_DIR)/.files-list$(3).stat - @touch $(BUILD_DIR)/packages-file-list$(3).txt - $(SED) '/^$(1),/d' $(BUILD_DIR)/packages-file-list$(3).txt + exec 3>$(BUILD_DIR)/packages-file-list$(3).txt; \ + flock -x 3; \ + $(SED) '/^$(1),/d' $(BUILD_DIR)/packages-file-list$(3).txt; \ cd $(2); \ LC_ALL=C find . \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \ - | LC_ALL=C sort > $(BUILD_DIR)/.files-list$(3).new + | LC_ALL=C sort > $(BUILD_DIR)/.files-list$(3).new; \ LC_ALL=C comm -13 \ $(BUILD_DIR)/.files-list$(3).stat \ $(BUILD_DIR)/.files-list$(3).new \ - > $($(PKG)_BUILDDIR)/.files-list$(3).txt + > $($(PKG)_BUILDDIR)/.files-list$(3).txt; \ sed -r -e 's/^[^,]+/$(1)/' \ $($(PKG)_BUILDDIR)/.files-list$(3).txt \ - >> $(BUILD_DIR)/packages-file-list$(3).txt + >> $(BUILD_DIR)/packages-file-list$(3).txt; \ mv $(BUILD_DIR)/.files-list$(3).new \ - $(BUILD_DIR)/.files-list$(3).stat + $(BUILD_DIR)/.files-list$(3).stat; \ + exec 3>&- endef define step_pkg_size From patchwork Mon Feb 17 21:23:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239606 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Lxtl1nSMz9sRG for ; Tue, 18 Feb 2020 08:28:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9BB1787134; Mon, 17 Feb 2020 21:28:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5uFjEZNRgT+j; Mon, 17 Feb 2020 21:28:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C723A8735C; Mon, 17 Feb 2020 21:28:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 607D21BF37B for ; Mon, 17 Feb 2020 21:28:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 59E2186887 for ; Mon, 17 Feb 2020 21:28:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Bzkv+cY6ZRHx for ; Mon, 17 Feb 2020 21:28:15 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by hemlock.osuosl.org (Postfix) with ESMTPS id C386E86864 for ; Mon, 17 Feb 2020 21:28:15 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 04467B902403; Mon, 17 Feb 2020 22:28:13 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:40 +0100 Message-Id: <20200217212350.29750-19-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 18/28] package/cmake: Fix for using -O in top-level make X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Setting -O in top level make somehow interferes with the explicit setting of -jX in the cmake bootstrap script. Avoid passing down MAKEFLAGS in the configure case. Signed-off-by: Andreas Naumann --- package/cmake/cmake.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 1f30736023..690603b09c 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -41,6 +41,7 @@ define HOST_CMAKE_CONFIGURE_CMDS (cd $(@D); \ $(HOST_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CMAKE_CFLAGS)" \ + MAKEFLAGS= \ ./bootstrap --prefix=$(HOST_DIR) \ --parallel=$(PARALLEL_JOBS) -- \ -DCMAKE_C_FLAGS="$(HOST_CMAKE_CFLAGS)" \ From patchwork Mon Feb 17 21:23:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239607 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Lxtm6bQrz9sRG for ; Tue, 18 Feb 2020 08:28:48 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 51E2E85C90; Mon, 17 Feb 2020 21:28:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 55pMjIYi3gxk; Mon, 17 Feb 2020 21:28:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 161178553C; Mon, 17 Feb 2020 21:28:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 9B4811BF37B for ; Mon, 17 Feb 2020 21:28:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 97CE68557B for ; Mon, 17 Feb 2020 21:28:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iMtjlS4ije9F for ; Mon, 17 Feb 2020 21:28:16 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by whitealder.osuosl.org (Postfix) with ESMTPS id 29F6884D49 for ; Mon, 17 Feb 2020 21:28:16 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 5EBBAB9019C0; Mon, 17 Feb 2020 22:28:14 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:41 +0100 Message-Id: <20200217212350.29750-20-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 19/28] core/pkg-infra: Add per-package support in qmake infra X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Qmake configured packages will, by default, use the absolute HostPrefix/Sysroot pathes set during configuration/building of qt5base for their install destinations. For the per-package host/staging infrastructure, this causes non-qt5base packages to litter the qt5base folders. In addition, buildroots target-install step subsequently fails because the respective files are missing from the per-package sysroot of the package itself. Fortunately, qmake's built-in pathes can be overridden by placing a custom qt.conf next to the qmake binary. This is already used to facilitate SDK relocation. So for per-package path manipulation we can reuse that method, but need to change the host/sysroot values according to each per-package path. Signed-off-by: Andreas Naumann Reviewed-by: Yann E. MORIN --- package/pkg-qmake.mk | 1 + package/qt5/qt5.mk | 15 +++++++++++++++ package/qt5/qt5base/qt5base.mk | 9 +-------- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 53ac3e4a1c..3aa0dd7101 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -46,6 +46,7 @@ $(2)_INSTALL_TARGET_OPTS ?= $$($(2)_INSTALL_STAGING_OPTS) # ifndef $(2)_CONFIGURE_CMDS define $(2)_CONFIGURE_CMDS + $$(QT5_QT_CONF_FIXUP) cd $$($(2)_BUILDDIR) && \ $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT5_QMAKE) $$($(2)_CONF_OPTS) endef diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index d94d9cc99f..eb2a749678 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -17,5 +17,20 @@ QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION) include $(sort $(wildcard package/qt5/*/*.mk)) +# The file "qt.conf" can be used to override the hard-coded paths that are +# compiled into the Qt library. We need it to make "qmake" relocatable and +# tweak the per-package install pathes +define QT5_INSTALL_QT_CONF + rm -f $(HOST_DIR)/bin/qt.conf && \ + sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ + $(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf +endef + +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define QT5_QT_CONF_FIXUP + $(QT5_INSTALL_QT_CONF) +endef +endif + # Variable for other Qt applications to use QT5_QMAKE = $(HOST_DIR)/bin/qmake -spec devices/linux-buildroot-g++ diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 03f984ef8c..960a802b3b 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -352,13 +352,6 @@ define QT5BASE_CONFIGURE_CMDS ) endef -# The file "qt.conf" can be used to override the hard-coded paths that are -# compiled into the Qt library. We need it to make "qmake" relocatable. -define QT5BASE_INSTALL_QT_CONF - sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ - $(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf -endef - -QT5BASE_POST_INSTALL_STAGING_HOOKS += QT5BASE_INSTALL_QT_CONF +QT5BASE_POST_INSTALL_STAGING_HOOKS += QT5_INSTALL_QT_CONF $(eval $(qmake-package)) From patchwork Mon Feb 17 21:23:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239611 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Lxts3W7vz9sRJ for ; Tue, 18 Feb 2020 08:28:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E120F86356; Mon, 17 Feb 2020 21:28:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jsC9ZVMA47fc; Mon, 17 Feb 2020 21:28:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id EADA48602E; Mon, 17 Feb 2020 21:28:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 9797E1BF963 for ; Mon, 17 Feb 2020 21:28:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 85208859BD for ; Mon, 17 Feb 2020 21:28:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4HuLWoNYl-3f for ; Mon, 17 Feb 2020 21:28:16 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7D3FF853C5 for ; Mon, 17 Feb 2020 21:28:16 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id AF245B901E25; Mon, 17 Feb 2020 22:28:14 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:42 +0100 Message-Id: <20200217212350.29750-21-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 20/28] qt5: Fix pkgconfig search path for per-package infrastructure X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Per default qmake uses the pkg-config binary and search path detected by qt5base and set in mkspecs/qconfig.pri. For per-package infra, this leads to packages not contained in qt5base not being detected. To overcome this, set the correct pathes in the global QMAKE variable. Signed-off-by: Andreas Naumann --- package/qt5/qt5.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index eb2a749678..c3b9f69c3f 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -33,4 +33,6 @@ endef endif # Variable for other Qt applications to use -QT5_QMAKE = $(HOST_DIR)/bin/qmake -spec devices/linux-buildroot-g++ +QT5_QMAKE = $(HOST_DIR)/bin/qmake -spec devices/linux-buildroot-g++ \ + PKG_CONFIG_SYSROOT_DIR=$(STAGING_DIR) \ + PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig From patchwork Mon Feb 17 21:23:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239613 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Lxtx4YSRz9sRG for ; Tue, 18 Feb 2020 08:28:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B68DB84D49; Mon, 17 Feb 2020 21:28:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fP-a2lpXJnPC; Mon, 17 Feb 2020 21:28:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id C72048608B; Mon, 17 Feb 2020 21:28:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 8F4271BF963 for ; Mon, 17 Feb 2020 21:28:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8619E855D9 for ; Mon, 17 Feb 2020 21:28:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BrEV9RlBP6Qy for ; Mon, 17 Feb 2020 21:28:17 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by whitealder.osuosl.org (Postfix) with ESMTPS id DEA548553C for ; Mon, 17 Feb 2020 21:28:16 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 1D841B9027A2; Mon, 17 Feb 2020 22:28:15 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:43 +0100 Message-Id: <20200217212350.29750-22-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 21/28] package/python-sip: Fix qmake usage for per-package build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since python-sip is not built by the qmake infra, we need to explicitly integrate the qt.conf fixup needed for successful per-package build and consistently use qmake via QT5_QMAKE variable. Signed-off-by: Andreas Naumann --- package/python-sip/python-sip.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk index 1d6c205396..7ae2d43e1e 100644 --- a/package/python-sip/python-sip.mk +++ b/package/python-sip/python-sip.mk @@ -38,6 +38,7 @@ define HOST_PYTHON_SIP_INSTALL_CMDS endef define PYTHON_SIP_CONFIGURE_CMDS + $(QT5_QT_CONF_FIXUP) (cd $(@D); \ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(HOST_DIR)/bin/python configure.py \ --bindir $(TARGET_DIR)/usr/bin \ @@ -46,7 +47,7 @@ define PYTHON_SIP_CONFIGURE_CMDS --sipdir $(TARGET_DIR)/usr/share/sip \ --sysroot $(STAGING_DIR)/usr \ --use-qmake && \ - $(HOST_DIR)/bin/qmake) + $(QT5_QMAKE)) endef define PYTHON_SIP_BUILD_CMDS From patchwork Mon Feb 17 21:23:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239612 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Lxtw2Z5Cz9sRG for ; Tue, 18 Feb 2020 08:28:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B502F86CAC; Mon, 17 Feb 2020 21:28:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ta4KGWWt8ELb; Mon, 17 Feb 2020 21:28:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id E2C9C86F58; Mon, 17 Feb 2020 21:28:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 4AE701BF37B for ; Mon, 17 Feb 2020 21:28:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1694E204B4 for ; Mon, 17 Feb 2020 21:28:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Oix1JAPluntC for ; Mon, 17 Feb 2020 21:28:19 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by silver.osuosl.org (Postfix) with ESMTPS id 4654C20000 for ; Mon, 17 Feb 2020 21:28:17 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 76D8FB90278E; Mon, 17 Feb 2020 22:28:15 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:44 +0100 Message-Id: <20200217212350.29750-23-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 22/28] package/python-pyqt5: Fix qmake usage for per-package build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since python-pyqt5 is not built by the qmake infra, we need to explicitly integrate the qt.conf fixup needed for successful per-package build. Note: Calling qmake via the QT5_QMAKE variable can not be done because it includes parameters which the python configure script does not accept. However, at the moment these parameters are only important for modifiying the per-package pkg-config pathes. This is assumed to be correctly done because the correct per-package sysroot path is supplied to the python configure script. Signed-off-by: Andreas Naumann --- package/python-pyqt5/python-pyqt5.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index 260a93af9c..60828fce1a 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -161,6 +161,7 @@ PYTHON_PYQT5_CONF_OPTS = \ define PYTHON_PYQT5_CONFIGURE_CMDS $(call PYTHON_PYQT5_GENERATE_QTDETAIL,$(@D)) + $(QT5_QT_CONF_FIXUP) (cd $(@D); \ $(TARGET_MAKE_ENV) \ $(TARGET_CONFIGURE_OPTS) \ From patchwork Mon Feb 17 21:23:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239608 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Lxtn4P6Lz9sRJ for ; Tue, 18 Feb 2020 08:28:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 44352204C0; Mon, 17 Feb 2020 21:28:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id izlA0Sue6Yvq; Mon, 17 Feb 2020 21:28:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id BFD72204DB; Mon, 17 Feb 2020 21:28:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A7DE11BF37B for ; Mon, 17 Feb 2020 21:28:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8D2A0853E6 for ; Mon, 17 Feb 2020 21:28:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nMW8VzRv5E5H for ; Mon, 17 Feb 2020 21:28:18 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by whitealder.osuosl.org (Postfix) with ESMTPS id A86AC84D49 for ; Mon, 17 Feb 2020 21:28:17 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id D7FF1B902B6E; Mon, 17 Feb 2020 22:28:15 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:45 +0100 Message-Id: <20200217212350.29750-24-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 23/28] package/qt5webengine: add libXdamage as XCB dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes a build failure. Signed-off-by: Andreas Naumann --- package/qt5/qt5webengine/Config.in | 1 + package/qt5/qt5webengine/qt5webengine.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 0e776ecb61..f98530fa4d 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -59,6 +59,7 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXSCRNSAVER if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_QT5BASE_XCB + select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_QT5BASE_XCB help The Qt WebEngine module provides a web browser engine that makes it easy to embed content from the World Wide Web into diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 798b777df0..cd7a0ba81c 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -23,7 +23,7 @@ QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \ ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \ - xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst + xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst xlib_libXdamage endif ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) From patchwork Mon Feb 17 21:23:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239609 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Lxtq30Rfz9sRG for ; Tue, 18 Feb 2020 08:28:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2E4C88622A; Mon, 17 Feb 2020 21:28:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 07tsy5WATmhm; Mon, 17 Feb 2020 21:28:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0A32185F9B; Mon, 17 Feb 2020 21:28:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 943EA1BF37B for ; Mon, 17 Feb 2020 21:28:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9094385868 for ; Mon, 17 Feb 2020 21:28:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8jCEA3Xm9LQt for ; Mon, 17 Feb 2020 21:28:18 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 15F608565B for ; Mon, 17 Feb 2020 21:28:18 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 3C3DBB902B71; Mon, 17 Feb 2020 22:28:16 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:46 +0100 Message-Id: <20200217212350.29750-25-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 24/28] package/qt5webengine: Add optional dependency on qt5quickcontrols2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The recipebrowser example depends on qt5quickcontrols2. Signed-off-by: Andreas Naumann --- package/qt5/qt5webengine/qt5webengine.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index cd7a0ba81c..c27bf85908 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -42,6 +42,10 @@ else QT5WEBENGINE_CONF_OPTS += QT_CONFIG-=alsa endif +ifeq ($(BR2_PACKAGE_QT5QUICKCONTROLS2),y) +QT5WEBENGINE_DEPENDENCIES += qt5quickcontrols2 +endif + # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. From patchwork Mon Feb 17 21:23:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239614 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Lxv02kYdz9sRG for ; Tue, 18 Feb 2020 08:29:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7F05387524; Mon, 17 Feb 2020 21:28:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6m33v1ebbsWN; Mon, 17 Feb 2020 21:28:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1F30A87100; Mon, 17 Feb 2020 21:28:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 490761BF37B for ; Mon, 17 Feb 2020 21:28:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3BAAD204C6 for ; Mon, 17 Feb 2020 21:28:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eNxnpvBXvQQe for ; Mon, 17 Feb 2020 21:28:24 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by silver.osuosl.org (Postfix) with ESMTPS id 6C424204A5 for ; Mon, 17 Feb 2020 21:28:18 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 9EE05B902B70; Mon, 17 Feb 2020 22:28:16 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:47 +0100 Message-Id: <20200217212350.29750-26-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 25/28] package/qt5webengine: Add optional dependency on qt5location X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" the webenginewidgets maps example depends on it Signed-off-by: Andreas Naumann --- package/qt5/qt5webengine/qt5webengine.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index c27bf85908..e0b39c354f 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -46,6 +46,11 @@ ifeq ($(BR2_PACKAGE_QT5QUICKCONTROLS2),y) QT5WEBENGINE_DEPENDENCIES += qt5quickcontrols2 endif +ifeq ($(BR2_PACKAGE_QT5LOCATION),y) +QT5WEBENGINE_DEPENDENCIES += qt5location +endif + + # QtWebengine's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. From patchwork Mon Feb 17 21:23:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239605 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Lxtj1sLqz9sRJ for ; Tue, 18 Feb 2020 08:28:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BCF19204A5; Mon, 17 Feb 2020 21:28:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aWFcIVq4BoM1; Mon, 17 Feb 2020 21:28:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B9152204B5; Mon, 17 Feb 2020 21:28:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 677931BF37B for ; Mon, 17 Feb 2020 21:28:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 62F9886887 for ; Mon, 17 Feb 2020 21:28:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9kMsH9Aoec3x for ; Mon, 17 Feb 2020 21:28:19 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by hemlock.osuosl.org (Postfix) with ESMTPS id DF88486864 for ; Mon, 17 Feb 2020 21:28:18 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 0B6FEB902B74; Mon, 17 Feb 2020 22:28:17 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:48 +0100 Message-Id: <20200217212350.29750-27-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 26/28] package/qt5virtualkeyboard: Add optional dependency on qt5quickcontrols2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The basic example depends on qt5quickcontrols2. Signed-off-by: Andreas Naumann --- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 162ed88c8c..ea41b5ff86 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -15,6 +15,10 @@ QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5base qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_QT5QUICKCONTROLS2),y) +QT5VIRTUALKEYBOARD_DEPENDENCIES += qt5quickcontrols2 +endif + QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 From patchwork Mon Feb 17 21:23:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239610 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Lxts0Pmrz9sRG for ; Tue, 18 Feb 2020 08:28:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4220F2048D; Mon, 17 Feb 2020 21:28:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sA6Gc0EBAkjI; Mon, 17 Feb 2020 21:28:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 054A9204B5; Mon, 17 Feb 2020 21:28:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 8FFDB1BF963 for ; Mon, 17 Feb 2020 21:28:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8CE8485951 for ; Mon, 17 Feb 2020 21:28:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hlT9vYyweHNC for ; Mon, 17 Feb 2020 21:28:20 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 39BB98577F for ; Mon, 17 Feb 2020 21:28:19 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 73006B902B75; Mon, 17 Feb 2020 22:28:17 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:49 +0100 Message-Id: <20200217212350.29750-28-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 27/28] package/qt53d: Add optional dependency on qt5multimedia X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The audio-visualizer-qml example depends on it. Signed-off-by: Andreas Naumann --- package/qt5/qt53d/qt53d.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index eeb1b3644c..c9db7cd0d7 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -10,6 +10,10 @@ QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz QT53D_DEPENDENCIES = qt5base qt5declarative QT53D_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_QT5MULTIMEDIA),y) +QT53D_DEPENDENCIES += qt5multimedia +endif + ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimp endif From patchwork Mon Feb 17 21:23:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239615 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Lxv42r4Zz9sRG for ; Tue, 18 Feb 2020 08:29:04 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CEF53860BF; Mon, 17 Feb 2020 21:29:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yiFvM9QwavG1; Mon, 17 Feb 2020 21:28:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id C6979861A4; Mon, 17 Feb 2020 21:28:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7954F1BF37B for ; Mon, 17 Feb 2020 21:28:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6D81784D49 for ; Mon, 17 Feb 2020 21:28:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CXCA0Wjgf11a for ; Mon, 17 Feb 2020 21:28:19 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9AA008553C for ; Mon, 17 Feb 2020 21:28:19 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id CE422B902B83; Mon, 17 Feb 2020 22:28:17 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:50 +0100 Message-Id: <20200217212350.29750-29-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 28/28] package/qt5charts: Add optional dependency on qt5multimedia X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The audio example depends on it. Signed-off-by: Andreas Naumann --- package/qt5/qt5charts/qt5charts.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 40f5efc2da..478cf9d6d8 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -24,4 +24,8 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5CHARTS_DEPENDENCIES += qt5declarative endif +ifeq ($(BR2_PACKAGE_QT5MULTIMEDIA),y) +QT5CHARTS_DEPENDENCIES += qt5multimedia +endif + $(eval $(qmake-package))