From patchwork Fri Sep 25 06:42:55 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4856 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 1A41F3F9EB for ; Fri, 25 Sep 2026 08:43:17 +0200 (CEST) Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-49e6422198fsf3818975e9.1 for ; Thu, 24 Sep 2026 23:43:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1790318596; cv=pass; d=google.com; s=arc-20260327; b=M5GEqNSS45L2DfcOuQ2LreuL/MW7hAKJO71AIPdHldnnYoxfnvzyB4rKUq9+BYIr4m 6vGA0HkbkFMhXNqLuAeb0CcdoeXIBvzrs7aSUI8Id/YlN18HwclxkBjDL/5YxhXOw2Ue 2geWMtBlgjDSDD3Tc6+3xCV2ySqXCci0xCqP8M9vb6WnQiJ3cTbEmOFByFZLp2YjPvH6 0/BJWFyLqbaNo7qDvmdUdPy5b7vv6MbFgN712pTrKlfhMy8aiQwiPvr+oo8PEx6kVobw ErKA2+WaIyJ3+cTrd3bDwzIzZeUbcrtei7eW3ZyUDVuXrSDTT02auKbSzsOm1ll2uBbR BYQg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=7RS9WuYl4tN/FgKUuYN8SU/a21bUOdMSKdOolCfvmT8=; fh=9QPjJDMU95SSFVVAxksY5Ms4rDwltfA4XSel1ESqZB0=; b=stlbCfqyTjnVYIX3eE5u152a3j6uVO+R4hRwYIliO8xEf5T90gO7T12ewvDQzCZCYd yv3Arb369euBNTg/HIdyTVAKCig5OV0jZWYVJCrOL36048zZY5jTbCmFc0jShq1GTJKo WuX+OJihWwnb7KHZOWe80KuOKiJHg3I+nCsBrlmKY3iqMSagHbC4kjQecv36E1+fJfX2 2zShV9mXg9ThQYWdpNxsyP8iNL1Vd80oxGFN3e29JBvTZZ4rJ/iqvVzFHxW/JjwmPre6 jF/cASZLohicDJ6xx9ysDCUfLrg5q/zD9ZUbVKQgR2bT1kZx9uj9HH6kgs8gGBuF3FfJ jeNg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=alI8kjBx; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1790318596; x=1790923396; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:content-type :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to:content-type; bh=7RS9WuYl4tN/FgKUuYN8SU/a21bUOdMSKdOolCfvmT8=; b=MBdyWZe6d7Y5JsOLcAx0LWbeEIQ7vkI3/3YZ4RJPZZPB/tSYqLTTEW5dtcCioKljNn AsIhtdg15vAM1sUa6wjeeZNIXmz78mmieYWqVCe2jTFYt17tAA2W9//gmUcZIbedN8MP kRd5eU0MBWwjUpyPxl1t41yJDjkwHYuHb7CjU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790318596; x=1790923396; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :content-type:x-original-authentication-results:x-original-sender :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-gg:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=7RS9WuYl4tN/FgKUuYN8SU/a21bUOdMSKdOolCfvmT8=; b=K4o9fc8lh5A4O5+SXycLBik13r1aLN52DJILOihGRcZZAMyhLjCGKDBfbwo/MSYZaF WzcFn0piqnPHiJinuKtBQ0qlGSOGxk8w8y9nn7bmLjTkr9sMIx55e1W8JkJyHM9pATJ3 K5Z6xrMxn/4A9dWawFvEjOfh3A5tZrl9AaXbbo1egdN5sZtFVoQ6P02hgFNhKcT5eyku gupk8jcNEsVs+kIqvMmcQbPdPEnkdhNzgFQ9VEVM6b1G0uXhityrl0zhQcXkRyRcf3Tk jQq6rMYEVt2C6qPmvevpFqf08WVkJP6BuA1F2wE5zgHsCXInai0vtSQIv7APFeQtCIUa 4pJA== X-Forwarded-Encrypted: i=2; AKwUvByVMNy9CvZ0wohO3wYjQYiDsfLE0DtfS/BqSjJC6qIhDVEKVKNFLiW4BUfd07d2VQ49Ag2tdNk8VAtkSH3h@patchwork.amarulasolutions.com X-Gm-Message-State: AFuF++nNGamSSPjVwAMY0YiBEGSCFO2Yf4yC5cOE4DGyneUk4HHBSrQ1 tsX/aX8xOfny4QOwYlJDMKsfMRjAuUcKvz83GYd1MIMc74b3nFTewCRfc6/7Syj8srzB5GAaIG3 XIA== X-Received: by 2002:a05:600c:19c7:b0:49f:e546:86e3 with SMTP id 5b1f17b1804b1-49fe670ee79mr80816235e9.35.1790318596554; Thu, 24 Sep 2026 23:43:16 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h="ATskLddfDbRgmXnupcTDzV+9wxnHjYb99xGKGAxA0d4CRRpkwA==" Received: by 2002:a05:600c:3b99:b0:495:abbb:e313 with SMTP id 5b1f17b1804b1-49fedb5ea36ls6521405e9.2.-pod-prod-01-eu; Thu, 24 Sep 2026 23:43:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvBxEleLSIRqpa9WGvqA4PvBVDJI7LYRzhFrgppMlcaV2V3xsiHpLNwsjkjAeT32WXFYwky//KmqUUV0jzvzu@amarulasolutions.com X-Received: by 2002:a05:600c:348a:b0:49f:ce78:356d with SMTP id 5b1f17b1804b1-49fe6705942mr75247185e9.30.1790318595186; Thu, 24 Sep 2026 23:43:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1790318595; cv=none; d=google.com; s=arc-20260327; b=S4Se3+/yxfgGsHsbEzFw6aT6Tcx/G+G4yKl2lJ5Dqddd969x3sojr7ZdtmoSG/MSU1 HPM0XJc8Z38Reo5v6w8oJOATj99q/YK2G9rvl77tgjYzQ9IQY1HYVe/DxoE04C/PihUY DKVOrNsyDtZGlAtYFIJjHvJ1z3eOaSS0xrt5aRE08mjumMk5W1Y/gFaC+EFJEaVvEjyS ktZkGlXE6w6fhZfrzJcaJ3C7Lio14kgnUHxck6mnv4mN5ZaB41xXOkV7j29hgffkqHsD 7OZ0+noG0hXnR5fBQO+Ee+CKKQRQRf1oVhbx5K+x4mz77W2nslC9/ilGxhU+HJG8rRJF qmUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=NyB/LB17yMC2PyrbWg24mMu9CT5cPQVqGOL3o80HKIg=; fh=89dWqauuavpOMdpCY/mnFjDmJlVgIgchyICnXsVYUdk=; b=dQDGArdpr+04ypQFbfkpx2chVgAPM6y0WDGVGk9SnbJFqDGhWZslf4vPKTkh9R4rX9 s1LmKVBIRknnQ97xz7BY27gppDV4jPXI3bXLjxfHbhfIvS7Jc0kaZkleXNGYG7NGPjQ4 WGpG1mApLP0lfsQtoZVrUI2niel3FRbKXDUv8tqgdp8CYE1Aiaatj94NJGOfOxfUyAtL KYWnsRLbvg5ssgCC+kqXvUYgyOTFNdn9feWaAH6KPOuqFgRRqJFh7eLSdkrOAiSHLneW EQrk/f/ZJ4c9PP6JXQRqKkNNTpzxM8OvgAsN1nC1XUgtfJSyhgD5OH0D6RCLqaSGLArV i3Fw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=alI8kjBx; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 5b1f17b1804b1-49ff06a9b09sor1770545e9.7.2026.09.24.23.43.15 for (Google Transport Security); Thu, 24 Sep 2026 23:43:15 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AKwUvByI9A6sYMzKQzzpO6lXp5lQo8tFQb8pyNxB1xEJDKSGmLA5jPrtYr2Mc3kqh511GhsEJjitwfyv59iV4Sou@amarulasolutions.com X-Gm-Gg: AYBFou1fh8nyQ60Op9cXL7LeyooBNuen4Ss+tbgR/vd6TI0eZ3KkBGP/NcYQ99wNrxi dJNAnzCmmenyZpPctMeyZDTbnPnOBoQfU9fy12zjesit6CQtTszAyOx7659N0szOJPXPpL1COAk jAaoa+MrxL4fbrhDq+d/KfjkodAi7ZjqFmBQcrvfj/sOELQnn/lLTHnLCXILezVARz96jiHB92I 5PgeHG4NPL/BE/bDH0c0Gua6xderJ2y1b8pnjGgF9lJEKPTpXi8vkQ2inCe4BFS7df/2UwAHR6D 25GEkbwrLkMM4eaSL+iLhyNG8SFavOutBFkVj97E3FXI/TIce2JGZmFxCbVZMd6kei3HEVsgfXH 1ic7CrKqIANO2cr1OJ/4F4INZJGR4yBawx2dOkglibdOEsYvs+CN/rh7I4kMPJMZd84LG43zBEL lNUPPFX0lzEL60ZIe8AcYTsJ8B/QBiee+y1ANHBCChqJ7l32EVfsJ+VTPeq2b4399lBHmswj4wm Gp/yTUn7G+GcYcwSiGKVf4b2oyZBVhRJc9Czi187GxcdoFYNKjf42xtCPxuXZamvD/MD7nW881r TQq3/fle9GaQhotXRVVpqDz6pBTm7b4czlqqtVA7sz41frmr3IhuJU5iIPNZ1bBrSzqN+bY= X-Received: by 2002:a05:600c:4e8b:b0:49f:ce78:356a with SMTP id 5b1f17b1804b1-49fe66fb018mr81759845e9.27.1790318594524; Thu, 24 Sep 2026 23:43:14 -0700 (PDT) Received: from dario-ThinkPad-P14s-Gen-5.homenet.telecomitalia.it (host-79-14-29-58.business.telecomitalia.it. [79.14.29.58]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fe5df44f9sm115584445e9.11.2026.09.24.23.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2026 23:43:13 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andrea Ricchi , Andreas Naumann , Angelo Compagnucci , Jesse Van Gavere , Roy Kollen Svendsen , linux-amarula@amarulasolutions.com, Thomas Petazzoni , Richard GENOUD , Dario Binacchi Subject: [PATCH v6 4/6] package/pkg-qmake: support Qt6 Date: Fri, 25 Sep 2026 08:42:55 +0200 Message-ID: <20260925064257.1162394-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260925064257.1162394-1-dario.binacchi@amarulasolutions.com> References: <20260925064257.1162394-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=alI8kjBx; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The qmake infrastructure hardcodes qt5base as the Qt provider. Select the Qt major version from BR2_PACKAGE_QT5, which is mutually exclusive with BR2_PACKAGE_QT6, and use it to pick the qtbase dependency, the QT_QMAKE command and the QT_QT_CONF_FIXUP hook. The header sync hook now takes the version from QT_VERSION_MAJOR and QT_VERSION instead of hardcoding 5.15. Document in the manual which Qt base package is added to the dependencies. Signed-off-by: Dario Binacchi --- Changes v4 -> v5: - Drop the hardcoded Qt versions, only select the major version from BR2_PACKAGE_QT5 - Take the version for the header sync hook from QT_VERSION_MAJOR and QT_VERSION - Document in the manual which Qt base package is added to the dependencies - Update the commit message docs/manual/adding-packages-qmake.adoc | 4 ++++ package/pkg-qmake.mk | 18 +++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/docs/manual/adding-packages-qmake.adoc b/docs/manual/adding-packages-qmake.adoc index e09da166b909..1d97556abe79 100644 --- a/docs/manual/adding-packages-qmake.adoc +++ b/docs/manual/adding-packages-qmake.adoc @@ -55,6 +55,10 @@ All the package metadata information variables that exist in the xref:generic-package-reference[generic package infrastructure] also exist in the QMake infrastructure. +The Qt base package the package is built against, +qt5base+ or ++qt6base+, is automatically added to its dependencies, depending on +whether +BR2_PACKAGE_QT5+ or +BR2_PACKAGE_QT6+ is enabled. + A few additional variables, specific to the QMake infrastructure, can also be defined. diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index ccf78692e885..7f73c3087b5f 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -20,11 +20,19 @@ # ################################################################################ +# Qt5 and Qt6 are mutually exclusive +ifeq ($(BR2_PACKAGE_QT5),y) +QT_VERSION_MAJOR = 5 +else +QT_VERSION_MAJOR = 6 +endif +QT_BASE = qt$(QT_VERSION_MAJOR)base + # # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + sed -e '/^MODULE_VERSION/s/$(subst .,\.,$(QT$(QT_VERSION_MAJOR)_VERSION_MAJOR))\.[0-9]*/$(QT$(QT_VERSION_MAJOR)_VERSION)/' -i \ $($(PKG)_BUILDDIR)/.qmake.conf touch $($(PKG)_BUILDDIR)/.git endef @@ -45,15 +53,15 @@ define inner-qmake-package $(2)_INSTALL_STAGING_OPTS ?= install $(2)_INSTALL_TARGET_OPTS ?= $$($(2)_INSTALL_STAGING_OPTS) -ifneq ($(1),qt5base) -$(2)_DEPENDENCIES += qt5base +ifneq ($(1),$(QT_BASE)) +$(2)_DEPENDENCIES += $(QT_BASE) endif ifeq ($$($(2)_SYNC_QT_HEADERS),YES) $(2)_PRE_CONFIGURE_HOOKS += QT_HEADERS_SYNC_HOOK endif -$(2)_POST_PREPARE_HOOKS += QT5_QT_CONF_FIXUP +$(2)_POST_PREPARE_HOOKS += QT$(QT_VERSION_MAJOR)_QT_CONF_FIXUP # # Configure step. Only define it if not already defined by the package @@ -62,7 +70,7 @@ $(2)_POST_PREPARE_HOOKS += QT5_QT_CONF_FIXUP ifndef $(2)_CONFIGURE_CMDS define $(2)_CONFIGURE_CMDS cd $$($(2)_BUILDDIR) && \ - $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT5_QMAKE) $$($(2)_CONF_OPTS) + $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT$(QT_VERSION_MAJOR)_QMAKE) $$($(2)_CONF_OPTS) endef endif