From patchwork Wed Aug 13 19:26:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4240 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 8A04D40D4A for ; Wed, 13 Aug 2025 21:26:27 +0200 (CEST) Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-afcb72b0baesf2878766b.0 for ; Wed, 13 Aug 2025 12:26:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755113187; cv=pass; d=google.com; s=arc-20240605; b=jNe8fXxoSZ8DfStsK0XeqXc3apLEG0ReBEF3n450hdINlmOSmyZv4EZoZ8qW4GUhTm +e5b8Zq0YfvwmxLZWYEl/gPlKHulO0Bi3t7UFXjgtQ6VkZjM487AF+Pk2jc04+A9O6Yj A23WQbFQDVGot2Bh8nwS2IlCkODulrVOH1UZeQ9eZ1fTchb6nhtCi0K8qwLQfJTJ8naJ bzj5bRY+Is3NTGG4uUUWKdKTi8nm1oA6k8ZMXN3fP5Ol7ww994JPkJ3ZswNa+mo3fyoQ F3z074nWc+stwhh/W7c2/aj2g21+j4gdsokudguODa1IXYMQm05aBch24XeyAjQK4gTA KI5A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=oG92LOUBq2w8zGrUWMssFVqeLln27tVLCgnErHvHC6U=; fh=lHxnlsYGjDdRQSPOndrbg93B39qNmlQ6m3B18tiZGv0=; b=fLFqclntgNVN9CvSzsH54AR1BWITaY5ll4MKQOhnTjAGBL33ECjZpUeOsby9lxgyue i/1mctjuDLZ/eFVTk9A3wwxnnWdLWNdwa5v9/dQVDXOW6mjJnnr8YBHyFh8p6N0LZ6Bi nrXykrYo0MhcVbjfyUARoEc9QoVroqxnSeXqmcHx9/7JfCfQ5GF6pKNnnTvcxtal2UlE 4no0lKwM5SgarRroejko85798ApKHh53wt14Fvuzdb0sG2VkQi87bnR92nAmpOVhfZ3l G/6GuHJpQn/ZBm7MVo5o4u4ErXVs9x82PDs7V0bHeOm3k8xZMhZeJeFc2jq/n2Wa8ftz 2Acw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LhPkwlgb; 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=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1755113187; x=1755717987; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence: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; bh=oG92LOUBq2w8zGrUWMssFVqeLln27tVLCgnErHvHC6U=; b=lxu0NMwyK0snLBv/sEdIC8AHqWHh/4o2hZAARehWdu8vvo3q01GLdr4wGuCNYx78dS OjeoWfIAayJ+juIBWji27nzTRfOR5P5K8Z8uUQoNjPFKf7B6wz5uIq1xgb7/bJUy4Y9v EUdrxbfW1TpT+whkh+1LTopfqtoiQn8cJfb0g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755113187; x=1755717987; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oG92LOUBq2w8zGrUWMssFVqeLln27tVLCgnErHvHC6U=; b=HoK3U8G18izUjJNQ4OoCIeM+jtzNUH0rMqnKa6ivyLiTjCUpe2c9kF7VCWiVjmiT2v AibL8348Rzd2ODIxyetkkN0laPCwE7Yd+Ptjwf8kjh4QEQ4q5MMqvrw5fl3Xi1ktrSF0 SOdD6HJ8+KfHRDCEXtOXkmovJ/RgLJm3Uc8r4/eJWXUJ0w8DCt0KLMRnBoJ7pHCRVCyn vI5oNlfRCbEXJuzEZzS7GyPFMxv4VMG4TbGghzlB5iOfmAEMCOl+qsXy50VzsZGXqlD6 h3Fng+fA/xtkWoQfvHN6GvgSxOBO3bWNo6e6nEWOsSSIU/ShObfRvCok1wfejet4veJp 5sjw== X-Forwarded-Encrypted: i=2; AJvYcCVZi+tZ/WhsYG7IUNfHMd898IRXfHLF+U78JnTOImgwgeb2Ik/Vy+WHKRWSzip/61zP2wtrClm9z+Ot0kiJ@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0Ywd6hpSVCqmOGXH9OgppobmZLcme9lJG7sLVz3jWbShzSlW+n7V iCcbJE6Q+RYME1YJv1xXZuZIsk7Mrl3ZP2CgMXiSTz9b+awhLnZVeL4WR1i4NrbHHXVwFA== X-Google-Smtp-Source: AGHT+IGzPA/fjFv1ZtM19976u1P9a6vmISG6FyNGJ0sa+7PXG3cMzGvyBtD1M80o6UTG+nLTOIbezg== X-Received: by 2002:a05:6402:1ed0:b0:615:a508:1d04 with SMTP id 4fb4d7f45d1cf-6188b9e4a3amr133472a12.3.1755113186923; Wed, 13 Aug 2025 12:26:26 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZfK0Ogwytozt+uAmbrvXBvQG/zXQDskmTuC6ab8/SPFEQ== Received: by 2002:a50:d686:0:b0:604:f62b:4112 with SMTP id 4fb4d7f45d1cf-6188a394f8als138699a12.2.-pod-prod-06-eu; Wed, 13 Aug 2025 12:26:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWRXVAe/Ldxc8bGNWdJGjTrOFMtOBB1T2QJFOtGUzNW8mZEGcifxuNTKbsgjGQs10hKk96ujQdyPy46VU2z@amarulasolutions.com X-Received: by 2002:a17:906:9f92:b0:af9:a8a6:d5eb with SMTP id a640c23a62f3a-afcb91e8b49mr34750766b.0.1755113184363; Wed, 13 Aug 2025 12:26:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755113184; cv=none; d=google.com; s=arc-20240605; b=IidyIliu+7OX3sRjVC8EfibUnIl3rmJqZTuuYpy+PpxtOZY9YMZmazFAmcDLRB3P3U FD9jKngPcpXR0X38vN+QQwFIUGekq44zifufIqjmpFvJSHICsAEbXHUpnm0/HkSjvGZP 3SrDDBrchR+5By4lyMy1ocxBG8u1YdhGDzhW43uZL5Q1OLlNLgB2pcyjvPOZuVOCngNy syRcGPB8Eyd5V2IrIL4ngJO5du83nAG0Zoz8zuwnB/C2Xk3ELCI1Gf9NyUuFsVEUfNrw o7nCwJsL/c4ixWJ/awGgy+lL6/0WgJ5r6Clz0uAP7v0cJkE5vh1FZC/5A+fG8BLeLwpr MSRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=8SSie2DvEC8aGt7yKTAVRQPP/EjwDwwbFMlKAoB2DOk=; fh=1mKE/SdvLaa8uir3ubMsB9e0OznmluXvBrEBvvD4pgw=; b=eM9v8mIneQibkwttnzmDmWyFmDvISltqKOBwYEs0OaNNj6TScuEjb9GnPNVDoU4brK Wu+V0MYGweadAkzLZTLIGp51Jky3hAD0KiDDFezq2VDYDSyAGd0iRRDb/O7IY+ckOxJh q+ZNuSGFf5JnLicMHywk9A+tEeOFpNvO5jPJdhT2FfHE6+Ikg739PZOxMwyWh4nxBYJB ACAxQV0k2tupzP/oX/GqeIw31WvImAog7tm57p2ICB1GyHEfNvogQCziDDp1VB9NGbWb 8yrzA4tLnhd/zWds2f9UdrHOSRupsLt+GVWSNfNJNpQx1sa5DyYIBvfDAOOfL09NjIsi aaWQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LhPkwlgb; 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=pass 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 a640c23a62f3a-af98c158e91sor945741666b.15.2025.08.13.12.26.24 for (Google Transport Security); Wed, 13 Aug 2025 12:26:24 -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; AJvYcCWEIEZAz2mvneiUxKkH4/XyLFOKC3FIVFscWPDIE0225M3EWcJdVlsPhQRZtFW/qMh57o/gI05Vb3ir1gxn@amarulasolutions.com X-Gm-Gg: ASbGnctMD0pzf8QbFpRA2QGlFGhjq0GZy7yHEMAZyQX7s4ytOAHlaWAg6Z1vSCTAgNn NuQWJ5cU5gvXFfcyVvuGcfwIsLihyYcQokqOVTHwMYNq63nuoGB8WvVPYpQ4Od5sCnKpiT3wPvq afr5iJIb27E8B3l406iFixfRUoJGw/A1tF97TtScHY/525Yuqwr2xJlBehQ5w4akkYwELVyByCL 476GxGcDagLmzJHmhyKH0xmeu1I7IDIbJue41T6tXZucCWi4rrYCQEdg8ajFokQwagDf3C/hfB5 cCYwcXLjJHzaT1NEJUN/GSeiePqxl/lWa64eKxBZZhFt8CBHkr+10flBn4yXu2pt+wJF535aU2O ZYjO2Nzx9AqkL5WaDY9EvpeYzW4j/QcC2NAHC+0ib3vu2SUSFskcmaUmIZM8vn/KY0/qgzeniy6 tMFw== X-Received: by 2002:a17:907:dac:b0:afc:b61a:df8 with SMTP id a640c23a62f3a-afcb98e1861mr29363666b.34.1755113183939; Wed, 13 Aug 2025 12:26:23 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.fritz.box ([2001:871:248:acda:3fd1:eaf1:73ac:376f]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-af91a0df10asm2453396166b.59.2025.08.13.12.26.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Aug 2025 12:26:23 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andreas Naumann , Angelo Compagnucci , Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni , linux-amarula@amarulasolutions.com, Andrea Ricchi , Dario Binacchi Subject: [RFC v2 3/5] package/pkg-qmake: support Qt6 Date: Wed, 13 Aug 2025 21:26:03 +0200 Message-ID: <20250813192605.1540321-4-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250813192605.1540321-1-dario.binacchi@amarulasolutions.com> References: <20250813192605.1540321-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=LhPkwlgb; 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=pass 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: , Extend build support to Qt6. Signed-off-by: Dario Binacchi --- (no changes since v1) package/pkg-qmake.mk | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index ccf78692e885..1449690ca114 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -20,11 +20,22 @@ # ################################################################################ + +ifeq ($(BR2_PACKAGE_QT5),y) +QT_VERSION = 5.15 +else +QT_VERSION = 6.8 +endif + +QT_VERSION_MAJOR = $(word 1,$(subst ., ,$(QT_VERSION))) +QT_VERSION_MINOR = $(word 2,$(subst ., ,$(QT_VERSION))) +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/$(QT_VERSION_MAJOR)\.$(QT_VERSION_MINOR)\.[3456789]/$(QT_VERSION)/' -i \ $($(PKG)_BUILDDIR)/.qmake.conf touch $($(PKG)_BUILDDIR)/.git endef @@ -45,15 +56,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 +73,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