From patchwork Mon Sep 1 20:32:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4263 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 F0B583F1F3 for ; Mon, 1 Sep 2025 22:32:51 +0200 (CEST) Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-b0419770d19sf144059366b.2 for ; Mon, 01 Sep 2025 13:32:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1756758771; cv=pass; d=google.com; s=arc-20240605; b=L7cgA2KDXbk1vqAABp2Pen5ecxaBDdczYtzngRn1Ga+QTV4eEjpBnW8EPtSzID5oXK 2AA9zcgKBr/aRChD+sVv8W58Tb28vu3MVC2VEOJWpSCqnRq38NIZ3KHnrXUz8QDjeuh6 vpFCZYnJp3vjaEsrw9w55wCH0AyVzhhkMudFzsYXXsaw612dAUGKs327VrfEzOQPwSrn IfR3Jezz1iwY/0MScaqPCumTNseDhjjOuEfD5WzdhktQeb1zu0EwPuzeYtTgBkxuRcfE Js6Io8X+2fVvHtotYJrLygYyrE7Z8Z6Ua57spcBHD+GLhPuO8IG6Q2353IpHTRpwf+Ps 2lyw== 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=u/7cu2xddv4jdoOSvsN2EkCcG0rZSXpF60MhDJMhGdg=; b=YJDE2Z3emDZtEfJtJJ/9SNcmcbKRY3vaVYaZkXXjKAxO4D364TsuHEfOwrAWlymGPk Gpm1DGQt36enhW9KKgLAZ0lnVmbm7pZ9bkh4nJHyEz0PeDEkMl+Mto2gu1ttnruPQ3kG 1yCbP2WKhwV4oU9KzcV/cXaTDBrWPgxKTUWKbcd1SF2UbSXOEdK7e3BstnuVKp+UEN+0 +ziNPLOECBHsCPBogGoRhBhyX7r7fgXMm9Iz7+CtcIXhFjfLmBYKy0WsbRIucMaLekxo Whdl2unsv1MV2IYFLKp/tTUVh41tZcwIsi9u4Uu1f5cJt3mfOHUy/0hIe7QZBarpO7RI ILwA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=IVE1U+wx; 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=1756758771; x=1757363571; 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=DmHYuxvurI0Cjgxw7u4g3tvr6mWXt30RM4PU6rCPpmrMTBmneyn4KE1IGSoT/OtvqF dWhghYnJ92mjEFdrixfM6zalT6ZzHyorxXZBxQaWcbc3YawgkxaYrW+oUnVgPHSp67HT wfEaANGifsoCZ/kg4IHav+1PBGQrgd7eEkECI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756758771; x=1757363571; 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=ZFaq9+mIbysgRBD0Up57XH2E5l85x39Ei5hyWhsuME15762ANH/ilyvfeH0CYioAB1 Q44jR31msL0KrT1reKvtoRUDFxBABMPvRClcXRi8qEilah9RMQskgoDhUe0vbTlRq12K IRIoRgmsV00F1+YvVHDlzOR4ICy+MNJv6VsUR7rzV4+oTtrI1h6mMTIZtG1/xdYstJKB 3PPEC7yPTJZzNJ0Xbpl8BYcUBw0xI0wMNkMJzsBc055SsfgeJgkrjHFQwX0V+EIEsgQx 9MhokVeupx+xY6qzN1QzkuLS6bBWlXbV6XhJHWWph3VpyRhEKWDxjRmmhfu9esciyvKo peXw== X-Forwarded-Encrypted: i=2; AJvYcCU7T7RhW9YyJ4LWyo9DB9TORkhoG0WSRat04TGXwXA1Hnk/XCfCy+ywzxb7g7kSH0twSs7T7z9KGWbdKsWx@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YxCJVF8P4mALxuOfPlLZ0R4Y9/4Jt9bNYKwF1TdHjaK2w2mXG7t rQw6xAEAO5inOWVlR/gPJsxG8i2o9MjFhzlo/DItLSuJVQSsRfU+eiY7xIhSa4FqKL30eQ== X-Google-Smtp-Source: AGHT+IG28J5hqHaP6wGRrQGBK0R2/qt3okwlHQXoxJn/QjkZxZy1ip51qdGWl6GTOAfNdQfgjKicBA== X-Received: by 2002:a17:907:c29:b0:b04:3402:3937 with SMTP id a640c23a62f3a-b0434024050mr389185366b.28.1756758771609; Mon, 01 Sep 2025 13:32:51 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZeUDQJHA4MDhM8W07Hsndz5MGdHBHuM0/q68MfbaChzig== Received: by 2002:a50:8d1d:0:b0:61c:3723:1d24 with SMTP id 4fb4d7f45d1cf-61cd427d53els3504456a12.2.-pod-prod-08-eu; Mon, 01 Sep 2025 13:32:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW8W9pn+lqZmjnbjZIQuSbeicO1wZeOkp4NfXl6tj/GyVItzQ8i8Gk4MptT+WIZ/h7RliLI5YZr8ZjbLBD3@amarulasolutions.com X-Received: by 2002:a17:907:5c1:b0:afe:d2e1:9018 with SMTP id a640c23a62f3a-b01d8c86721mr941058366b.25.1756758769124; Mon, 01 Sep 2025 13:32:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1756758769; cv=none; d=google.com; s=arc-20240605; b=Y53LkhfbjAAm3Q7Ass0HQFY3u+2j2FksvMfZ9Hss4uTSXcj60vin4ryZpOA7Th2clX 93NpypYCkyGGB2kOZmAiZFhIVpg/csnNF320Y0gvbJnBW8vrF8B0GCtPAkqwTqGxMnle DUuBZcWkWTEaSCwmH+XyUbVVNyLKfbivGqtgFJlqF74bLqMCGjkOwUssKgzc1fgCPYH5 LiLpcUQNCBst6nqoGPBv0KrPLkrSkjX91TenL4Lk45gA1uXKh+sc0Q7A7FFGilOq3XSL cymLnukA9SuriqrXpPvkrXPRHlNDlNbAdyG9Rlm9C1NlDDvlmQyc1qiV+4MW7sGBncYy nb1g== 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=UQsaxWZnJSaTXrvL6TFiiJQ7TOtNF2hkMtYJL6u86t0=; b=XLgEGVBJ0j3JoJ22uLW6qmU231doSZS2k9QCbvPYc1nO8HYBMf92aBM/wWTLQFpwpl UDNU/AwQoeUcx2sLwGEHFUXHh7UMxUsV2KrkSsLKIw6MSaXBEHTLUGLEudkG/MGfvZnH 2uFLX3CPC6F20IwMh7xvnqJmS65wHgp4rNF3K8hixb3Wyh6aS7+RxZdWa2saeBLZsOI5 nki1yn5NbTFzw2t795vzAmKxGteFRX39qWBtzzeJiPkBwxtMSXyE6AkhktJJS9VlYVTe 1k39eG0+syzk3ogTfAZNRZ4Yrsdfvns4my9SUiXTT8zNRtsXZ3UM6s2MgY6oV1puGNiy cpXw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=IVE1U+wx; 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-b012ecbdfe2sor195975766b.11.2025.09.01.13.32.49 for (Google Transport Security); Mon, 01 Sep 2025 13:32:49 -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; AJvYcCV6j4MfgmufUttfng5aFWZ0bu6Xhc5b8Cxk6bSQ/XJj95kCFABgDKXUJeq+AbvSZot8SyO4sZzCuLRwhsfn@amarulasolutions.com X-Gm-Gg: ASbGncufgDTDydQOioT9UHoSk6lTiVtRS8MqO7zAVuZCwMNW76SqqP08Y4SuDgCcJrp cA1IIxkgCswNdoKMWrzQO+sXuTWZUV40TDd3zOAKmzLFDWewggY0tChUgiCHCOFr025LvUY+LxM PF0qGcQu6YkLm2tGzmfB1RCglRZeMr1gvUGv8JaI3ja9wIgGi8E/VSniYjocY4SMUIRbTFKT+BR /TSzrWB0m4brPBDmCRdkHAKG4smMIvQRePpKpH0knIIAvhqLCQoatFrd6rgk45NVPKXaJ3qzn29 p7ZrEYH36aRjyfVw5vK8fh6Idh6t+mVCa9APYQ4rQ3Cag4bE+qSzqLFQa87AnrgXr8Mm9MHJiX5 ZObpC/7GstcEJzu8tnc8D/Uh737nEaAzEoKsIZJlOmRcZHv5tRH1dVCm+DFYtVeLqugVGCFyq3h EDtYRArxKe3RhaEkcKfB5hWA== X-Received: by 2002:a17:907:9712:b0:afe:b781:e893 with SMTP id a640c23a62f3a-b01d9793548mr945078766b.43.1756758768672; Mon, 01 Sep 2025 13:32:48 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.43.39]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b0411bf1b09sm553530166b.79.2025.09.01.13.32.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Sep 2025 13:32:48 -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 , Giuseppe D'Angelo , Richard Genoud , Dario Binacchi Subject: [RFC v4 3/5] package/pkg-qmake: support Qt6 Date: Mon, 1 Sep 2025 22:32:08 +0200 Message-ID: <20250901203210.804061-4-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250901203210.804061-1-dario.binacchi@amarulasolutions.com> References: <20250901203210.804061-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=IVE1U+wx; 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