From c9b0b42b907757a004b008faf973aec3f4d92a81 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 26 Aug 2026 23:00:42 +0200 Subject: [PATCH] package/qt6: fix c++ static_assert issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the last qt6 version bump to 6.11.1 [1], the TestQuazipQt6 fail to build due to a c++ static_assert issue. Backport a patch from v6.11.2 release. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/16060153667 (TestQuazipQt6) [1] https://gitlab.com/buildroot.org/buildroot/-/commit/05cd38635a1c2a8e6c44170b5eae8488b0c7a104 Signed-off-by: Romain Naour [Julien: fix link to qt6 version bump commit] Signed-off-by: Julien Olivain (cherry picked from commit 240ea08d3f1568b463a9bce09da524bbf42e6b99) Signed-off-by: Raphaël Mélotte --- ...e.cpp-remove-is_always_lock_free-sta.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/qt6/qt6base/0001-qtestsupport_core.cpp-remove-is_always_lock_free-sta.patch diff --git a/package/qt6/qt6base/0001-qtestsupport_core.cpp-remove-is_always_lock_free-sta.patch b/package/qt6/qt6base/0001-qtestsupport_core.cpp-remove-is_always_lock_free-sta.patch new file mode 100644 index 0000000000..3347caa8da --- /dev/null +++ b/package/qt6/qt6base/0001-qtestsupport_core.cpp-remove-is_always_lock_free-sta.patch @@ -0,0 +1,41 @@ +From 2983318421d623c6c9feff95ff947ca489f4313d Mon Sep 17 00:00:00 2001 +From: Mitch Curtis +Date: Mon, 11 May 2026 08:41:08 +0800 +Subject: [PATCH] qtestsupport_core.cpp: remove is_always_lock_free + static_assert + +This causes a build failure when cross-compiling Qt for MIPS32 targets +(e.g. `mips-unknown-linux-musl`, `mipsel-unknown-linux-musl`). + +Amends 9b938823776865837901f29082301f5624ac2b04. + +Fixes: QTBUG-146670 +Change-Id: I170bd9f93c1ef809f56e5b36835e457bbbe8e16c +Reviewed-by: Thiago Macieira +Reviewed-by: Qt Cherry-pick Bot + +Upstream: https://github.com/qt/qtbase/commit/2983318421d623c6c9feff95ff947ca489f4313d +[Romain: backport to 6.11.1] +Signed-off-by: Romain Naour +--- + src/corelib/kernel/qtestsupport_core.cpp | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/corelib/kernel/qtestsupport_core.cpp b/src/corelib/kernel/qtestsupport_core.cpp +index 9bbe1c18e84..5f28cedec68 100644 +--- a/src/corelib/kernel/qtestsupport_core.cpp ++++ b/src/corelib/kernel/qtestsupport_core.cpp +@@ -8,10 +8,6 @@ + + using namespace std::chrono_literals; + +-// Assert that this instantiation of std::atomic is always lock-free so we +-// know that no code will execute on destruction. +-static_assert(std::atomic::is_always_lock_free); +- + QT_BEGIN_NAMESPACE + + // ### Qt 7: reduce the default: QTBUG-138160 +-- +2.55.0 +