Date: Mon, 23 Oct 2023 16:56:04 GMT From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 89d10367e4eb - main - www/webkit2-gtk3: fix build with lld 17 Message-ID: <202310231656.39NGu43k012546@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=89d10367e4ebaa6c7a04bfe51da9911fa8f03fa7 commit 89d10367e4ebaa6c7a04bfe51da9911fa8f03fa7 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2023-10-23 16:40:57 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2023-10-23 16:55:35 +0000 www/webkit2-gtk3: fix build with lld 17 Building www/webkit2-gtk3 with lld 17 results in the following link errors: ld: error: version script assignment of 'global' to symbol 'bmalloc::PerThreadStorage<bmalloc::PerHeapKind<bmalloc::Cache> >::s_didInitialize' failed: symbol not defined ld: error: version script assignment of 'global' to symbol 'bmalloc::PerThreadStorage<bmalloc::PerHeapKind<bmalloc::Cache> >::s_key' failed: symbol not defined ld: error: version script assignment of 'global' to symbol 'bmalloc::vmPageSize()::cached' failed: symbol not defined The mentioned symbols are no longer external, and have been removed in upstream commits: https://github.com/WebKit/WebKit/commit/655e1bb394f423d6c15de98f5874ab181076d016 https://github.com/WebKit/WebKit/commit/a1c80bec178456c109a62723ff937405cdb35b6b Since the former does not apply cleanly due to edits in the ChangeLog, merge the functional changes in a single port patch file. PR: 274677 Approved by: gnome (blanket) MFH: 2023Q4 --- .../files/patch-Source_WebKit_webkitglib-symbols.map | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/www/webkit2-gtk3/files/patch-Source_WebKit_webkitglib-symbols.map b/www/webkit2-gtk3/files/patch-Source_WebKit_webkitglib-symbols.map new file mode 100644 index 000000000000..51b1d56082b3 --- /dev/null +++ b/www/webkit2-gtk3/files/patch-Source_WebKit_webkitglib-symbols.map @@ -0,0 +1,12 @@ +--- Source/WebKit/webkitglib-symbols.map.orig 2021-05-17 13:22:43 UTC ++++ Source/WebKit/webkitglib-symbols.map +@@ -3,9 +3,6 @@ global: + jsc_*; + webkit_*; + extern "C++" { +- "bmalloc::PerThreadStorage<bmalloc::PerHeapKind<bmalloc::Cache> >::s_didInitialize"; +- "bmalloc::PerThreadStorage<bmalloc::PerHeapKind<bmalloc::Cache> >::s_key"; +- "bmalloc::vmPageSize()::cached"; + "WebKit::NetworkProcessMain(int, char**)"; + "WebKit::WebKitExtensionManager::initialize(WebKit::InjectedBundle*, API::Object*)"; + "WebKit::WebKitExtensionManager::singleton()";
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310231656.39NGu43k012546>