Thanks! Alex
On Tue, 9 Mar 2021 at 06:11, Khem Raj <[email protected]> wrote: > upstream is informed about this via > https://bugs.webkit.org/show_bug.cgi?id=222959 > > On Mon, Mar 8, 2021 at 7:58 PM Alexander Kanavin <[email protected]> > wrote: > > > > Please send the patches upstream first, I wouldn’t normally ask for it > explicitly, but there’s a history of webkit patches that are forever > pending and cause pain on version updates. > > > > Alex > > > > On Tue 9. Mar 2021 at 4.54, Khem Raj <[email protected]> wrote: > >> > >> This fixes linking failures > >> Source/WTF/wtf/text/StringImpl.h:1115: undefined reference to > `__atomic_compare_exchange_1' > >> > >> Signed-off-by: Khem Raj <[email protected]> > >> --- > >> .../webkitgtk/webdriver-libatomic.patch | 23 +++++++++++++++++++ > >> meta/recipes-sato/webkit/webkitgtk_2.30.5.bb | 3 +++ > >> 2 files changed, 26 insertions(+) > >> create mode 100644 > meta/recipes-sato/webkit/webkitgtk/webdriver-libatomic.patch > >> > >> diff --git > a/meta/recipes-sato/webkit/webkitgtk/webdriver-libatomic.patch > b/meta/recipes-sato/webkit/webkitgtk/webdriver-libatomic.patch > >> new file mode 100644 > >> index 0000000000..bd9ac9d1f5 > >> --- /dev/null > >> +++ b/meta/recipes-sato/webkit/webkitgtk/webdriver-libatomic.patch > >> @@ -0,0 +1,23 @@ > >> +link with libatomic > >> + > >> +This fixes build with C11 > >> + > >> > +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 > >> +| collect2: error: ld returned 1 exit status > >> + > >> +Upstream-Status: Pending > >> +Signed-off-by: Khem Raj <[email protected]> > >> + > >> +--- a/Source/WTF/wtf/CMakeLists.txt > >> ++++ b/Source/WTF/wtf/CMakeLists.txt > >> +@@ -529,6 +529,10 @@ list(APPEND WTF_LIBRARIES > >> + ICU::uc > >> + ) > >> + > >> ++list(APPEND WTF_LIBRARIES > >> ++ -Wl,--as-needed -Wl,-latomic -Wl,--no-as-needed > >> ++) > >> ++ > >> + set(WTF_INTERFACE_LIBRARIES WTF) > >> + set(WTF_INTERFACE_INCLUDE_DIRECTORIES ${WTF_FRAMEWORK_HEADERS_DIR}) > >> + set(WTF_INTERFACE_DEPENDENCIES WTF_CopyHeaders) > >> diff --git a/meta/recipes-sato/webkit/webkitgtk_2.30.5.bb > b/meta/recipes-sato/webkit/webkitgtk_2.30.5.bb > >> index a1dd76ce81..3daf31f7d3 100644 > >> --- a/meta/recipes-sato/webkit/webkitgtk_2.30.5.bb > >> +++ b/meta/recipes-sato/webkit/webkitgtk_2.30.5.bb > >> @@ -20,6 +20,9 @@ SRC_URI = " > https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ > >> file://include_xutil.patch \ > >> file://reduce-memory-overheads.patch \ > >> " > >> +SRC_URI_append_riscv64 = " file://webdriver-libatomic.patch" > >> +SRC_URI_append_riscv32 = " file://webdriver-libatomic.patch" > >> + > >> SRC_URI[sha256sum] = > "7d0dab08e3c5ae07bec80b2822ef42e952765d5724cac86eb23999bfed5a7f1f" > >> > >> inherit cmake pkgconfig gobject-introspection perlnative > features_check upstream-version-is-even gtk-doc > >> -- > >> 2.30.1 > >> > >> > >> > >> >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#149157): https://lists.openembedded.org/g/openembedded-core/message/149157 Mute This Topic: https://lists.openembedded.org/mt/81193908/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
