diff options
| author | Khem Raj <raj.khem@gmail.com> | 2021-03-08 18:15:47 -0800 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2021-03-10 13:09:35 +0100 |
| commit | 324843cb1a2feb5f5c7b0064ca33edaa605cb749 (patch) | |
| tree | 2a5281fbf59573b844fa7aad9d9851bba95bde5a | |
| parent | a1981938c245473f08f0531fc4c821cb67d26296 (diff) | |
| download | meta-qt5-324843cb1a2feb5f5c7b0064ca33edaa605cb749.tar.gz | |
qtwebkit: Fix build with gcc11/riscv
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtwebkit/0010-webdriver-libatomic.patch | 23 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebkit_git.bb | 3 |
2 files changed, 26 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0010-webdriver-libatomic.patch b/recipes-qt/qt5/qtwebkit/0010-webdriver-libatomic.patch new file mode 100644 index 00000000..39ee847c --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0010-webdriver-libatomic.patch | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | link with libatomic | ||
| 2 | |||
| 3 | This fixes build with C11 | ||
| 4 | |||
| 5 | lib/../Source/WTF/wtf/CMakeFiles/WTF.dir/Assertions.cpp.o:/usr/include/c++/11.0.1/bits/atomic_base.h:520: more undefined references to `__atomic_compare_exchange_1' follow | ||
| 6 | | collect2: error: ld returned 1 exit status | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | |||
| 11 | --- a/Source/WTF/wtf/CMakeLists.txt | ||
| 12 | +++ b/Source/WTF/wtf/CMakeLists.txt | ||
| 13 | @@ -245,6 +245,10 @@ if (NOT USE_SYSTEM_MALLOC) | ||
| 14 | list(APPEND WTF_LIBRARIES bmalloc) | ||
| 15 | endif () | ||
| 16 | |||
| 17 | +list(APPEND WTF_LIBRARIES | ||
| 18 | + -Wl,--as-needed -Wl,-latomic -Wl,--no-as-needed | ||
| 19 | +) | ||
| 20 | + | ||
| 21 | list(APPEND WTF_SOURCES | ||
| 22 | unicode/icu/CollatorICU.cpp | ||
| 23 | ) | ||
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 15a954d9..5f3d55a5 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
| @@ -23,6 +23,9 @@ SRC_URI += "\ | |||
| 23 | file://0009-Riscv-Add-support-for-riscv.patch \ | 23 | file://0009-Riscv-Add-support-for-riscv.patch \ |
| 24 | " | 24 | " |
| 25 | 25 | ||
| 26 | SRC_URI_append_riscv32 = " file://0010-webdriver-libatomic.patch " | ||
| 27 | SRC_URI_append_riscv64 = " file://0010-webdriver-libatomic.patch " | ||
| 28 | |||
| 26 | inherit cmake_qt5 perlnative | 29 | inherit cmake_qt5 perlnative |
| 27 | 30 | ||
| 28 | inherit python3native | 31 | inherit python3native |
