From patchwork Sat Mar 9 14:10:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1053842 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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 44GmVZ0Nx7z9s47 for ; Sun, 10 Mar 2019 01:10:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8EE7022E54; Sat, 9 Mar 2019 14:10: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 fRQcWaNfhCla; Sat, 9 Mar 2019 14:10:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 8F92B214E6; Sat, 9 Mar 2019 14:10:40 +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 A624A1BF5E0 for ; Sat, 9 Mar 2019 14:10:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5069287ACE for ; Sat, 9 Mar 2019 14:10:36 +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 oAtTlIWdWcuK for ; Sat, 9 Mar 2019 14:10:28 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5424.kasserver.com (dd5424.kasserver.com [85.13.138.252]) by hemlock.osuosl.org (Postfix) with ESMTPS id 47EA28738B for ; Sat, 9 Mar 2019 14:10:28 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bb577.dynamic.kabel-deutschland.de [178.27.181.119]) by dd5424.kasserver.com (Postfix) with ESMTPA id 3DED2B582BE8; Sat, 9 Mar 2019 15:10:26 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Sat, 9 Mar 2019 15:10:21 +0100 Message-Id: <20190309141022.13140-2-anaumann@ultratronik.de> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190309141022.13140-1-anaumann@ultratronik.de> References: <20190309141022.13140-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] qt5base: Fix inconsistencies when overriding qmake properties 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: , Reply-To: dev@andin.de Cc: Peter Seiderer , Andreas Naumann , =?utf-8?q?Ga=C3=ABl_Portay?= , thomas.petazzoni@bootlin.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When querying the qmake properties with our custom qt.conf present, I noticed that they were different from the built-in ones (without qt.conf). Most notably QT_INSTALL_PREFIX was a concatenated string of two absolute pathes (hostdir + sysroot). This is due to Prefix being set to our HOST_DIR and HostPrefix not being set at all. I guess this was also the root cause of the initial problem with qt.conf.in, because once Prefix and HostPrefix were set to their correct values, re-setting all the other default pathes became obsolete. (However, since our pathes for Headers, Plugins and Examples are non-default, they still have to be explicitely set.) There is one additional exception to this: Omitting 'Settings' leads to the CONFIGURATION path being plain /usr, whereas the default without qt.conf is /usr/etc/xdg. Thus 'Settings' is now also explicitely set, in order to keep behaviour with/without qt.conf as similar as possible. Signed-off-by: Andreas Naumann --- package/qt5/qt5base/qt.conf.in | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in index 9a0b9cd53b..46ebe61614 100644 --- a/package/qt5/qt5base/qt.conf.in +++ b/package/qt5/qt5base/qt.conf.in @@ -1,19 +1,8 @@ [Paths] -Prefix=@@HOST_DIR@@ +Prefix=/usr +HostPrefix=@@HOST_DIR@@ Sysroot=@@STAGING_DIR@@ Headers=/usr/include/qt5 -Libraries=/usr/lib -LibraryExecutables=/usr/libexec -Binaries=/usr/bin Plugins=/usr/lib/qt/plugins Examples=/usr/lib/qt/examples -Qml2Imports=/usr/qml -Imports=/usr/imports -Translations=/usr/translations -Examples=/usr/lib/qt/examples -Demos=/usr/lib/qt/examples -Tests=/usr/tests -Settings=/usr -Documentation=/usr/doc -ArchData=/usr -Data=/usr +Settings=/usr/etc/xdg From patchwork Sat Mar 9 14:10:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1053843 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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 44GmVm2WPJz9s47 for ; Sun, 10 Mar 2019 01:10:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BA35D80C0A; Sat, 9 Mar 2019 14:10:53 +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 amnxCH_bx-9U; Sat, 9 Mar 2019 14:10:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7E6EA85F2D; Sat, 9 Mar 2019 14:10:49 +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 6FB6C1BF41C for ; Sat, 9 Mar 2019 14:10:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CE5878734E for ; Sat, 9 Mar 2019 14:10:40 +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 jqhvi8Yff2j7 for ; Sat, 9 Mar 2019 14:10:30 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5424.kasserver.com (dd5424.kasserver.com [85.13.138.252]) by hemlock.osuosl.org (Postfix) with ESMTPS id 6ED14870D7 for ; Sat, 9 Mar 2019 14:10:29 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bb577.dynamic.kabel-deutschland.de [178.27.181.119]) by dd5424.kasserver.com (Postfix) with ESMTPA id 889FCB5838D3; Sat, 9 Mar 2019 15:10:27 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Sat, 9 Mar 2019 15:10:22 +0100 Message-Id: <20190309141022.13140-3-anaumann@ultratronik.de> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190309141022.13140-1-anaumann@ultratronik.de> References: <20190309141022.13140-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] qt5: Prepare qmake 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: , Reply-To: dev@andin.de Cc: Peter Seiderer , Andreas Naumann , =?utf-8?q?Ga=C3=ABl_Portay?= , thomas.petazzoni@bootlin.com 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 proper locations of the package itself. Fortunately, qmake's built-in pathes can be overridden by either placing a custom qt.conf next to the qmake binary or running qmake with the -qtconf parameter. The former variant is already used to facilitate SDK relocation. So for per- package path manipulation we can reuse the existing qt.conf. But rather than in place, a modified copy is created in the package's build folder. While this makes it necessary to change all calls to qmake (for which a variable already exists), it avoids headaches when finally merging the per-package host folders. Finally, QT5_QMAKE was extended and is now used consistently, together with the qt.conf fixup, in all respective packages. Signed-off-by: Andreas Naumann --- package/python-sip/python-sip.mk | 3 ++- package/qt5/qt5.mk | 9 ++++++++- package/qt5/qt53d/qt53d.mk | 3 ++- package/qt5/qt5canvas3d/qt5canvas3d.mk | 3 ++- package/qt5/qt5charts/qt5charts.mk | 3 ++- package/qt5/qt5connectivity/qt5connectivity.mk | 3 ++- package/qt5/qt5declarative/qt5declarative.mk | 3 ++- package/qt5/qt5enginio/qt5enginio.mk | 3 ++- package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 3 ++- package/qt5/qt5imageformats/qt5imageformats.mk | 3 ++- package/qt5/qt5location/qt5location.mk | 3 ++- package/qt5/qt5multimedia/qt5multimedia.mk | 3 ++- package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 3 ++- package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 3 ++- package/qt5/qt5script/qt5script.mk | 3 ++- package/qt5/qt5scxml/qt5scxml.mk | 3 ++- package/qt5/qt5sensors/qt5sensors.mk | 3 ++- package/qt5/qt5serialbus/qt5serialbus.mk | 3 ++- package/qt5/qt5serialport/qt5serialport.mk | 3 ++- package/qt5/qt5svg/qt5svg.mk | 3 ++- package/qt5/qt5tools/qt5tools.mk | 3 ++- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 3 ++- package/qt5/qt5wayland/qt5wayland.mk | 3 ++- package/qt5/qt5webchannel/qt5webchannel.mk | 3 ++- package/qt5/qt5webengine/qt5webengine.mk | 3 ++- package/qt5/qt5webkit-examples/qt5webkit-examples.mk | 3 ++- package/qt5/qt5webkit/qt5webkit.mk | 3 ++- package/qt5/qt5websockets/qt5websockets.mk | 3 ++- package/qt5/qt5x11extras/qt5x11extras.mk | 3 ++- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 3 ++- package/qt5cinex/qt5cinex.mk | 3 ++- package/qwt/qwt.mk | 1 + 32 files changed, 69 insertions(+), 31 deletions(-) diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk index 69019f5f19..98c3c736d4 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_QTCONF_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 diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index d8012a913d..e03660a8f9 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -32,5 +32,12 @@ define QT5_LA_PRL_FILES_FIXUP done endef + +define QT5_QTCONF_FIXUP + sed -e "s#^HostPrefix.*#HostPrefix=$(HOST_DIR)#g" \ + -e "s#^Sysroot.*#Sysroot=$(STAGING_DIR)#g" $(HOST_DIR)/bin/qt.conf \ + > $(@D)/qt.conf +endef + # 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++ -qtconf $(@D)/qt.conf diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index 48a931d60b..06db38ba82 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -18,7 +18,8 @@ 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) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT53D_BUILD_CMDS diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.mk b/package/qt5/qt5canvas3d/qt5canvas3d.mk index ef5b373d02..1beec7b310 100644 --- a/package/qt5/qt5canvas3d/qt5canvas3d.mk +++ b/package/qt5/qt5canvas3d/qt5canvas3d.mk @@ -19,7 +19,8 @@ QT5CANVAS3D_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 endif define QT5CANVAS3D_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5CANVAS3D_BUILD_CMDS diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 9e2e6de881..405a4357d1 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -25,7 +25,8 @@ QT5CHARTS_DEPENDENCIES += qt5declarative endif define QT5CHARTS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5CHARTS_BUILD_CMDS diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 6de1536b78..eeca32bc70 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -27,7 +27,8 @@ 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) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5CONNECTIVITY_BUILD_CMDS diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 2fe72b3be6..20166d8eb6 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -19,7 +19,8 @@ QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt endif define QT5DECLARATIVE_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5DECLARATIVE_BUILD_CMDS diff --git a/package/qt5/qt5enginio/qt5enginio.mk b/package/qt5/qt5enginio/qt5enginio.mk index 38f309646f..89eb99879b 100644 --- a/package/qt5/qt5enginio/qt5enginio.mk +++ b/package/qt5/qt5enginio/qt5enginio.mk @@ -23,7 +23,8 @@ QT5ENGINIO_DEPENDENCIES += qt5declarative endif define QT5ENGINIO_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5ENGINIO_BUILD_CMDS diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index c5011a94f0..a2f0ba6b25 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -19,7 +19,8 @@ QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 endif define QT5GRAPHICALEFFECTS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5GRAPHICALEFFECTS_BUILD_CMDS diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index fa13ebedaf..3d8f33af21 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -19,7 +19,8 @@ QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL endif define QT5IMAGEFORMATS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5IMAGEFORMATS_BUILD_CMDS diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index da0aad7961..7998e72eda 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -23,7 +23,8 @@ QT5LOCATION_DEPENDENCIES += qt5declarative endif define QT5LOCATION_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5LOCATION_BUILD_CMDS diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 27a65ce1ca..10a210e7a6 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -35,7 +35,8 @@ QT5MULTIMEDIA_DEPENDENCIES += alsa-lib endif define QT5MULTIMEDIA_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5MULTIMEDIA_BUILD_CMDS diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 3e0c5effb3..6add8d2be1 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -19,7 +19,8 @@ QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICE endif define QT5QUICKCONTROLS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5QUICKCONTROLS_BUILD_CMDS diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index c2004c2ee7..a7dcf0a906 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -14,7 +14,8 @@ 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) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5QUICKCONTROLS2_BUILD_CMDS diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 4a292c95a5..65093f45a0 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -28,7 +28,8 @@ QT5SCRIPT_LICENSE_FILES += \ src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING define QT5SCRIPT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5SCRIPT_BUILD_CMDS diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index de9ece597c..33522a5b01 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -17,7 +17,8 @@ QT5SCXML_LICENSE := $(QT5SCXML_LICENSE), BSD-3-Clause (examples) endif define QT5SCXML_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5SCXML_BUILD_CMDS diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index 2d5cf327a6..74681a6b97 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -23,7 +23,8 @@ QT5SENSORS_DEPENDENCIES += qt5declarative endif define QT5SENSORS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5SENSORS_BUILD_CMDS diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 98c4466cb8..227c19e0b1 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -14,7 +14,8 @@ 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) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5SERIALBUS_BUILD_CMDS diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 2b0953586b..9d0a6882e6 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -19,7 +19,8 @@ QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_E endif define QT5SERIALPORT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5SERIALPORT_BUILD_CMDS diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index 48ff04bd75..af6df94830 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -19,7 +19,8 @@ QT5SVG_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE. endif define QT5SVG_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5SVG_BUILD_CMDS diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index a972756d3a..aa20353c82 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -49,7 +49,8 @@ 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) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5TOOLS_BUILD_CMDS diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 8ce3169774..41d21a5ffd 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -64,7 +64,8 @@ endef endif define QT5VIRTUALKEYBOARD_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake $(QT5VIRTUALKEYBOARD_QMAKEFLAGS)) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) $(QT5VIRTUALKEYBOARD_QMAKEFLAGS)) endef define QT5VIRTUALKEYBOARD_BUILD_CMDS diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index d6fb6e1888..9a5ee240f1 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -31,7 +31,8 @@ QT5WAYLAND_QMAKEFLAGS += CONFIG+=wayland-compositor endif define QT5WAYLAND_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake $(QT5WAYLAND_QMAKEFLAGS)) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) $(QT5WAYLAND_QMAKEFLAGS)) endef define QT5WAYLAND_BUILD_CMDS diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index f1c08532c0..91967acfbd 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -26,7 +26,8 @@ QT5WEBCHANNEL_DEPENDENCIES += qt5declarative endif define QT5WEBCHANNEL_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5WEBCHANNEL_BUILD_CMDS diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index a3cfcec26e..4d251d9eb7 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -64,7 +64,8 @@ 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)) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBENGINE_ENV) $(QT5_QMAKE) $(QT5WEBENGINE_QMAKEFLAGS)) endef define QT5WEBENGINE_BUILD_CMDS diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk index 94153fd652..61d27adf93 100644 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk @@ -27,7 +27,8 @@ QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5xmlpatterns endif define QT5WEBKIT_EXAMPLES_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5WEBKIT_EXAMPLES_BUILD_CMDS diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index a0a0998d12..9b1b11e68a 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -45,7 +45,8 @@ 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) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(QT5_QMAKE) WEBKIT_CONFIG+=use_system_leveldb) endef define QT5WEBKIT_BUILD_CMDS diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index c67db198db..87ce570fde 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -26,7 +26,8 @@ QT5WEBSOCKETS_DEPENDENCIES += qt5declarative endif define QT5WEBSOCKETS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5WEBSOCKETS_BUILD_CMDS diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 9d54c11061..b7932ae152 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -19,7 +19,8 @@ QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EX endif define QT5X11EXTRAS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5X11EXTRAS_BUILD_CMDS diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 0a8b47ac53..ddc0911b75 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -22,7 +22,8 @@ QT5XMLPATTERNS_LICENSE := $(QT5XMLPATTERNS_LICENSE), BSD-3-Clause (examples) endif define QT5XMLPATTERNS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) + $(QT5_QTCONF_FIXUP) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef define QT5XMLPATTERNS_BUILD_CMDS diff --git a/package/qt5cinex/qt5cinex.mk b/package/qt5cinex/qt5cinex.mk index 89c38ee3f5..75b1b41665 100644 --- a/package/qt5cinex/qt5cinex.mk +++ b/package/qt5cinex/qt5cinex.mk @@ -18,7 +18,8 @@ QT5CINEX_LICENSE = CC-BY-3.0 QT5CINEX_LICENSE_FILES = README define QT5CINEX_CONFIGURE_CMDS - cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake + $(QT5_QTCONF_FIXUP) + cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) endef define QT5CINEX_BUILD_CMDS diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index f381ebbb7a..985de13d3d 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -43,6 +43,7 @@ endif define QWT_CONFIGURE_CMDS $(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri + $(QT5_QTCONF_FIXUP) (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef