3857bccca5
CVE-2021-38593 fixes originally missed a usecase that was covered by the
to-be-removed patch. However, this patch was incorrect and added some
issues on its own, which was then fixed by now-removed
0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch.
Unfortunately for us, the to-be-removed patch (fixed by
0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch) can actually
be applied (with fuzz; by `patch` only) on top of the now-removed patch.
When the move to KDE Qt fork was made, some patches were removed as they
were already part of the new git fork. However, the to-be-removed patch
was not. This means the
0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch was actually
undone when Buildroot patched qt5base.
Let's remove this patch to fix this oversight.
As a reference:
e7ea2ed27c Improve fix for avoiding huge number of tiny dashes
fixed by
65b3aa6a1c Refix for avoiding huge number of tiny dashes
in the git repo.
Fixes: 5770a645a3 "package/qt5: bump packages to latest kde submodule versions"
Cc: Quentin Schulz <foss+buildroot@0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
[Arnout: renumber patches 0007 and 0008]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
49 lines
2.2 KiB
Diff
49 lines
2.2 KiB
Diff
From e9d1f80dffb4e29e44fc0b0627704af15cdd281a Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Sun, 13 Mar 2022 12:05:04 +0100
|
|
Subject: [PATCH] src/corelib/configure.json: fix atomicfptr detection
|
|
|
|
Fix atomicfptr detection on sparc v8 by linking with libatomic if needed
|
|
to avoid the following build failure:
|
|
|
|
/sysroot -std=gnu++11 -w -fPIC -I. -I/home/peko/autobuild/instance-0/output-1/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/mkspecs/devices/linux-buildroot-g++ -o main.o main.cpp
|
|
> /home/peko/autobuild/instance-0/output-1/host/bin/sparc-linux-g++ --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot -Wl,-O1 -o atomicfptr main.o -lexecinfo -lrt -lpthread -ldl
|
|
> /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: main.o: in function `test(std::atomic<void (*)(int)> volatile&)':
|
|
> main.cpp:(.text+0x40): undefined reference to `__atomic_compare_exchange_4'
|
|
> collect2: error: ld returned 1 exit status
|
|
> make[1]: *** [Makefile:69: atomicfptr] Error 1
|
|
|
|
[...]
|
|
|
|
ERROR: detected a std::atomic implementation that fails for function pointers.
|
|
Please apply the patch corresponding to your Standard Library vendor, found in
|
|
qtbase/config.tests/atomicfptr
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/5a20e984a5536165056b3fbd93b8712e8ddbeed4
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status:
|
|
https://invent.kde.org/qt/qt/qtbase/-/merge_requests/138]
|
|
---
|
|
src/corelib/configure.json | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
|
|
index 9b5d19d41b..ac88f5856c 100644
|
|
--- a/src/corelib/configure.json
|
|
+++ b/src/corelib/configure.json
|
|
@@ -309,7 +309,8 @@
|
|
"test(fptr);"
|
|
],
|
|
"qmake": "CONFIG += c++11"
|
|
- }
|
|
+ },
|
|
+ "use": "libatomic"
|
|
},
|
|
"clock-monotonic": {
|
|
"label": "POSIX monotonic clock",
|
|
--
|
|
2.34.1
|
|
|