From patchwork Thu Aug 14 15:32:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4247 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 43BA24207C for ; Thu, 14 Aug 2025 17:33:26 +0200 (CEST) Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-afcb79ff10asf15165066b.2 for ; Thu, 14 Aug 2025 08:33:26 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755185606; cv=pass; d=google.com; s=arc-20240605; b=T5Lt9xJwYrDs6HY6XbOgDBXYEJVnBzLHKZWS4m3XzxiK5kVXcbOwpGaHRs9X+P9EgK clmh0ZMj2BkfcTiyiUM5Zu/JPOzC69ORQfcVOvclbFIDnk2vnpqP2XZilvWEZV0hq79j pSnj280nhnAZvwe2KRK+7oPbP5x/p3awdSZLFaPH9ue3mUv+KB9/FAlDVkrcPUc57l0b qxrNucBun6pGHcuJbgN6tv9T+HL3khEtKGPC//6E21zly4VEwWQNhkzKebWVOCtKSlio 1+Q3HL5d6lQV80uYkdILYW5k/RrL6sQ6XPuH87oXKNasks1/AysxwTduClmZH6P39b67 7uuA== 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=0DiH81bv9s5ZMvyQ8tScx2UMN+lZj4PpNtkrk4ub5W4=; b=AC1Jr9a5mpZRio53ykeipdyCOrSndKFT4wntaVtRAEYrtm8Zple79Bk5noLzHmpnRu CH4miqeYa9cub17bRjbMnU/+X1a+8b5im5pGrt/IoF3f8wBgC8JLsG9KZ6jYKfTP3Gyl snQjccTYy/r6pJs6A+IalK+UzLLdg54pGqaYfzC7cTNyqnRpGA1T797vWYKt2/bFwi9g OC4XLcIl4pZl6talcE+1UHiMhpnAD3li/KhXBXvKVvQhlUWn1tw2jWWY5ilVxnsucVb2 dZctBRPsEzBsajR67MzuIKc8KwRSfocIdfiw3gIg/+fXGQFtq58g7aSQWmWxgw13wpK2 rwCg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=UHinUT+f; 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=1755185606; x=1755790406; 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=F+sJiGJ2S8MPC5A4eZQx6CPbQg882pakxFDDswIEqF080fOa4BKbhmBuIa5HQo5Q4c ETkiu+U0PvLrL/3eVyPxlJjVnkWbk9sA3DnVvgFcqZMYRPL4J9ItJ7vhV6iMlVNWNgHM 5I9toMYT+XmZZjvabLVX8gJAbiSbldZeH0vrY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755185606; x=1755790406; 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=R0VGH984Vds/vJ0A+gh2KE6HQeXbdwhDWDVitGzMhRNi1hCNYo3286X/S5nqCmWmWY svv0yp4L2brm5xgRy35ErM+UeNLVYeoPDrZmE7qVOv75XmUnHhVlzF+HQvYB7gHuv5Ba uVffP0fTI29nI7fjUGPpuok6IoJAEOBKBFqBFiLM/zOEE/1YltAU6BE2r1UcB1HVbuYW 9bplQXCPp7K0h3G2l/MOvXlyqQVh1LLYnvnwUwUMkj9lf0EWCBvTRLVgSXBi0MN5oxou +2QEvZ5+zJogRG0y2SxhhSPiISeHKMYqrJM7DWV4TKN/moU437ZbvlX3vG6/5ALdu2R9 B6ig== X-Forwarded-Encrypted: i=2; AJvYcCXlaBAR/MqalRpqjyMaPxIuoGCEx9RxVZXvDJpiayEdfP3v357yeZre9lHjcpbMuSs3w/5PXVfDFbKsuIke@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YySaCH6R6xNjpYYe04nOfkPCq5Q9TUoCAd1QGKLyR1pmsmWPNOC LUrxnb4tnx+F2SQ9theu38jnSausUgOZp792EIXzq1EB/5pNnXXqoIOGOZ98vcyCSc1Bww== X-Google-Smtp-Source: AGHT+IG+Iy/hlCT0KLFIz0JrNGVbjZPrO3NwYNhMPrVMhwR8ee80wEOKzN2qBezB4cJ5LMXEQkzhwA== X-Received: by 2002:a05:6402:5191:b0:615:d492:5bf3 with SMTP id 4fb4d7f45d1cf-6188ba28c06mr1314223a12.6.1755185605819; Thu, 14 Aug 2025 08:33:25 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZcV42wn9/wBcdQrNfRmfNrXIN1y3nSFWPylRLucdPSozw== Received: by 2002:a50:d686:0:b0:604:f62b:4112 with SMTP id 4fb4d7f45d1cf-6188a394f8als767256a12.2.-pod-prod-06-eu; Thu, 14 Aug 2025 08:33:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV3IOtyOGKanXDEEN+Q/QXmlG5ebGlMSdNdq1oHTH7FbL5xSlhOafBkS841rHnR7sMQgKf1OXu2AKTfNErW@amarulasolutions.com X-Received: by 2002:a17:906:dc90:b0:af9:acc3:823f with SMTP id a640c23a62f3a-afcb995ef91mr308661166b.58.1755185603435; Thu, 14 Aug 2025 08:33:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755185603; cv=none; d=google.com; s=arc-20240605; b=A/dWbawh8j5u1KfnnJgRJIqZhIe9WJoKhlsDjfMQ/4MWj+8gqI6lzDchU9mZxk1b7G XYmYxjxulqnzyLvV2FdU78zgZFOMWlRsick5qZCmfpGbUc7NZd90u3vv8wJ3Iymsm7UN OIZUA7KommUxCHN2Sih3aeO7tnUzcB+ID++OSfCklrMpyvTDuJe+UgUQdhA27rJ6mQda tx1HtQdkUlrRCaRKdgHlbuhpufp+hRiMYJFSXrOXuZ8yd8Z5oUjeKIpnr9zxS34Dmm9R y/rUxqa4JNELa34MF3gvmvHFVpGVObNp4KhPPHm2s9HjBsQw52pcLQ++KdefaMV9N/Y8 lCqg== 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=pWdIbbagmQlE+dim+/UbLBjzwrUQmYCL3012/re7fXQ=; b=QBZlQiNEur77NtUNABigpCgWZ1fVTQKcqh9FHpzTX1Jw02RWOVZGDJb4Vv9BJHj+u/ X/IBROqt+cy2eJHD4IlmKlchDZRBoQtnOVvn32i/i8l/eZPa7SVwlKt0tAMWE/sWH+Db ms2b9A+LKa9pj8bL/2Re3J/Tuw6xC4LNDAfQSoQs0wsoWYtS9std2mz4B0LGD4U/K7Wg xsdi96fgZg1Kt+BsA0TdJ5QtTJ5j5IgBRIXOpLFRlc76qZvIhT8PsnCnikQGtmW6uKwK 1EbEfGOHJoVx8Gpic4M/WVsGcxAquFYiL0vX7a6OCQhkWCfdTGfkZyNezD1h2zWTfbXl qt3Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=UHinUT+f; 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-af932112ad6sor1804606066b.4.2025.08.14.08.33.23 for (Google Transport Security); Thu, 14 Aug 2025 08:33:23 -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; AJvYcCVxMyWBgiIuEKQNFHPSwBLOIg/peE+zmkNTTd9JsZqiS8ClYFA4V7z1OQyrIhUODJcKRV+hUoUVBFcAWAG9@amarulasolutions.com X-Gm-Gg: ASbGncvYvxJxC2VyuYGOPwoMywGenu5ISRe0aCva6dpT9TPO+8OPPROtBDAYbdRUPI/ znNiFcAIvx3JO0eWHx83WCWifQyS9MGnm6AiZYwlIk7CZRisbGdIC84JQ8EJzbVmh3ibrbgvzau p1x+YE1R66eKv+L+YY4NmNiJU6YB1VMnkAmaR4CZ2fZzjKtDncjZ1vB7iE+OUSPrM6crzEUNRBR yPNY0ptnzg35b2XkQ+fDxl7epSFE1AJZ0ye7junDOOyFScmiFJr2So0+E/HO5R92MyJZZk2mj5Z GqgvdtOma3O5QSB5vxHogNzD3zh7mhk5l5mVSzuKiYo3kyjqQq3Lhnd7I/TBah6kviwNP4I5LCW qozmNNUex9MZqqu01UgDnbfErSXy9xHq2DgYj63UTIqr67U7UuUKSb6YOT3+QGagUzhtsANpNoN OT X-Received: by 2002:a17:907:9710:b0:af9:c119:3b4 with SMTP id a640c23a62f3a-afcb93be17bmr352138066b.13.1755185602927; Thu, 14 Aug 2025 08:33:22 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.fritz.box ([2001:871:248:acda:9b30:e43:d6cd:c58f]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-af91a21c022sm2561928966b.101.2025.08.14.08.33.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 08:33:22 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andreas Naumann , Angelo Compagnucci , Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni , Andrea Ricchi , Giuseppe D'Angelo , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [RFC v3 3/5] package/pkg-qmake: support Qt6 Date: Thu, 14 Aug 2025 17:32:57 +0200 Message-ID: <20250814153259.6822-4-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250814153259.6822-1-dario.binacchi@amarulasolutions.com> References: <20250814153259.6822-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=UHinUT+f; 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