From patchwork Wed Aug 6 11:52:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4232 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id C335C3F14B for ; Wed, 6 Aug 2025 13:53:22 +0200 (CEST) Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3b7886bfc16sf3891253f8f.1 for ; Wed, 06 Aug 2025 04:53:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1754481202; cv=pass; d=google.com; s=arc-20240605; b=kpWua+y4FJBrqg8aOun8k+sg7XLbHQvOV/LKRzw1JlvLTegA4+GKaB0K9zQxH/bF0W OZoSFRp5Bw0cYDY1dm/aXjpt7rCnikINzNoewWds+buxxBj7nCt19a9dq3VENzv4Kucc ca9TMrjI8RFBq2nkKqr5diGHgjDEsYeccGfMEZW6DE9QRJ8tm3ZWL5kc0gR0hCpGqnPH SZ4BULSfLCD7qxnLtqkjhxyD1VtF5/0m3oH4WG+u5RSLpFk6CXCrYEge9pJcZqPM01SH E5eA0xRvFaQV0Kx/DeUwX7ItaF8KonSuhZTb8GobOWvjTpObEzgiFjHiaV8edDslxlN5 edUg== 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=Y/+DySOVlijLzWtayFvNoVtu2pt21XT3Cb7rqpTGrr8=; fh=u+LHwlVypr7m3X2cn19Y5wvOSDdNzBXhpdRpfeppO1I=; b=jp2iEWWOR5fMo8W+71ZCxgy7ImluzeZROPlSJepaZmuPNyuJG4BrmEQ7eD6JANsoJv D+tevSVxyUJlzOMHI4ElN3s7Ycf2zjby7Pa3OB9sKIbF9HsM7rl3cFxwHghvZ65SCwmk m5P+Q1wLP8xQzqYmYfpj25DgMCX22O3hKUbKuHDvAkQeil/KK+lhnidOREJrrLEQLjbY mQ9ZUojm1R0FEGaqIiC4Ke4snXRqzfUEYY3xlGoX8KuoNtD2VQNOt05EEB/Ibq840AdA LA/TnG9soJcLwe/rMMeAmamYTGQF0hd+NmQfT4pyXXMFfIFV/LtMYtL0fesYdips1mli N0uA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=aTkVskdZ; 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=1754481202; x=1755086002; 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=Y/+DySOVlijLzWtayFvNoVtu2pt21XT3Cb7rqpTGrr8=; b=FTotSwmgz3UBGbhs/AkWl1J70qVL+2WLU652z/OcVCLeal73XrnFyH4iZeUeLzGF4k JayA2s4qmt4ggwuA9pNjJ2BE56yRc+YbuJSYCSlbR84A+6URNnbtdjYslxf52cfmlhMD mG8E4LLxCQuYAXMr+NhmIfejwv8AVbRgwYiGY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754481202; x=1755086002; 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=Y/+DySOVlijLzWtayFvNoVtu2pt21XT3Cb7rqpTGrr8=; b=W85wCqFb+fc88i/IijxF62XjLCpxlAcSrR7AJiSb28XsdpKw6LD2yVL8Bo+UFzC9iI 5bydNwphRllWuDYJLJrGcpf7ap8chGAOJgerMifoVmjTg31oqy0Y2iuQDJ0Ij/2QPs7P t5bA+UOJQgSGsjdqywgvDGKd3i893L+zsN05l8EQ2Bby4oeSF09JbKEqzXyvPSU3cNMD ZS8zdqY8FQKJT4ukZQ995heUkreqRNrtS6D5Vfg9CBOzIQWSLz0xnxh0iKjJydufqUhb +0sBVpIYGBrjNWBYSwtK7AgODMDTuNw3V3FHtosRi+8MeUVntMJZDaeZ5oN1hY0gDgkf CcDw== X-Forwarded-Encrypted: i=2; AJvYcCXJ9lXPq1NBRkE1txW+qoJo7/ypeoFRof7tGtMcx+3RnvnOKieH25QYXMYlGb9Lv6jEhG1eKZeUUhNIMkaW@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YzaxECxcgZeF6tVUvFj2UD5UpwQrxr89XUcsHoSfOfrO5BJRq68 Wn+Dxrlw7KsmIxolRlNQIs8Uje7y9qmWzEWa1TXQvLLul8fNxcrcs721ebB854aQOThuTg== X-Google-Smtp-Source: AGHT+IF4MKYuQDCT7CEljrH40FBC9gez+nVzoNZNS2219/XVCN6v9MOPki3kIYHYXUweSfRE1StUww== X-Received: by 2002:a05:6000:2313:b0:3a4:f8fa:8a3a with SMTP id ffacd0b85a97d-3b8f41620f8mr2039649f8f.18.1754481202257; Wed, 06 Aug 2025 04:53:22 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZeLXSrhPAr+rRxUfsATdVMuW/DHgZcCMuMJDIa/iN4oow== Received: by 2002:a05:6000:2c0b:b0:3b7:89fd:a279 with SMTP id ffacd0b85a97d-3b79c3561eels3027544f8f.0.-pod-prod-05-eu; Wed, 06 Aug 2025 04:53:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXRg36C+/LcQxCJJHs2lpfZP9+xsfxnAm/1jyCKjKpMveznmf5Bb7nlqstEN8whwtOIU171rG0DLmY5o6Kf@amarulasolutions.com X-Received: by 2002:a05:6000:381:b0:3a4:e68e:d33c with SMTP id ffacd0b85a97d-3b8f41ae244mr2271109f8f.47.1754481199725; Wed, 06 Aug 2025 04:53:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1754481199; cv=none; d=google.com; s=arc-20240605; b=hLr19yBLFn6qW2WP+vyfRoGQ7bJ3iggyOH0rR+CPvqxMv0MEZOSuvGq7OT1RQzuppI LccT0QjJ1whU0RWomQwlLm4kq+9MElMjCUq/EFD/xbkKknHGfcSKqXBZchftqxOY/lfV FIwG/Ddft61AxDQoa216U1dIV8xbFzBi0jfAfWzIj2q9zLwj7iH9VYYkMTyzq4aTsvhM pfS+BcArBFoG9gjZyBTYwyXy0mRnFRGlgXP0DXbPAP6kR285ejWhPCbtzseKt5/7OC7/ XZgLJGBxUGj5m6H0tuBd0ixKdNYPUgG3NHwdlHm/hUBIP5Fot5iY/H9fDBAk3ZdV1X61 ok9g== 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=V3A8T3go1kMZqLquCA73NL1gpnU9RCDFAIwiJjewnio=; fh=omxUURsQqMTimmVZH8Iyo69UqX8LNbyvTv+pL6/wy2E=; b=cbFlXbwBUYAK31AdAuMEu4S9o5NdgT0loKGs6cmx2uESjq9R8WFqG+BvHufEBYzGhk o186TKt2fNFmmAgLwj63fPVg4I/jsfj5JbqrZ3KR98Doa3i+tsC3cmQM/KrODIvmiKsP f1OcyalpE5CBYS/ad3iQkw3R9eDylcHql37HB1qEnK2eAXulyA0/FldCXVHc+505z3hK 0WKsE4Ii39eTJNPvImtsB0TsW3NjC9C55yWwRdUGk2/Oy8KctASCRoG92xHLH3IS3J6p W0Kip9dJuf8zi8+gj+itdP4x0Ev+z02QdYIU0295otrGwSD6MVDRGpIwHC03z/ypSyKw MWAg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=aTkVskdZ; 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 ffacd0b85a97d-3b8d33f2427sor6445960f8f.2.2025.08.06.04.53.19 for (Google Transport Security); Wed, 06 Aug 2025 04:53:19 -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; AJvYcCXNBnmMHjBNq6d16jUJdKsAIFi8zWoLQlcp5XrrTNLyr714aKCOtfjhanBrED2mSLln7W6gIw4XvR9eqFKY@amarulasolutions.com X-Gm-Gg: ASbGncuFjhDL4JuekgCar4vN7aC89o4bfPMNBDAqxt1qs2gt1628FIvNy2wf56c/UBP ED8CT6SpP32s2e36KkciZjGgLMHvDiCLLKHHksyVEHjt9svp8C647bP517aDx56zBwy50c2GtDe 0aHr+3Sr0iOrE0Lib7i5wOh4mU9xqbiJttG2pKF/6aEMhWN7Byl1eOx9+hViyBwscIW5xOWO/Nm X9BAfTeTKQgG+NVsbht5tIvDIoDh9Tpsm2iTzYvJ+64jha/8McdY9hRn0ZNDWJraTmoDRkoYRYr +iC/6CP25sDrWktPwM/RLspvC/QRl4gwSc3YoIpo1x8NwGJFT3lY8eP0uYFPVpMtb85lv8ytCfb RSBoSEOnmDT6O6YTgNWyCIK0SfwBMZoysPhwktTCH0zpihNAiXpU92VK+L+C/7pMXj+KfLqF/m+ +vWzrNq4DPNA139WPCuA== X-Received: by 2002:a5d:5d07:0:b0:3b8:893f:a185 with SMTP id ffacd0b85a97d-3b8f41b8ae2mr2221230f8f.53.1754481199110; Wed, 06 Aug 2025 04:53:19 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2001:b07:6474:ebbf:3f96:8759:f916:8982]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-459c58ed07fsm142606555e9.22.2025.08.06.04.53.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Aug 2025 04:53:18 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andreas Naumann , Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni , linux-amarula@amarulasolutions.com, Angelo Compagnucci , Giuseppe D'Angelo , Dario Binacchi Subject: [RFC PATCH 3/4] package/pkg-qmake: support Qt6 Date: Wed, 6 Aug 2025 13:52:18 +0200 Message-ID: <20250806115219.3307438-4-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250806115219.3307438-1-dario.binacchi@amarulasolutions.com> References: <20250806115219.3307438-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=aTkVskdZ; 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 --- 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