From nobody Mon Oct 23 16:56:04 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDhCm6NRlz4yGDm; Mon, 23 Oct 2023 16:56:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SDhCm5vfkz4WjT; Mon, 23 Oct 2023 16:56:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698080164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c9L1i6LBzvRfrlen9XowmXvR81cPjK1w3zR8799vstw=; b=MiHmfz30sYIeRhsnXeAFndi6lEyClXarreSxEXMVHUW0nOUGfsTXoCJhh7rFCi7W6h0dyz BAz0awMpjDsj3c4OJ9ARGGyZOLT5F6VcazDuWroeC/hME6QIfmwYdrBTviJmqLDEIROYpx y86uldwrAPCKl4y6rrD1RpyGGBwJmUj7Rh6OfZPMRSAlAO9hmPJF5SNlx8VuNCgZXfHUBn ZZUZ/9ukDhw0u5QG9kuaOgYcZRjVrcmlUzag4aYJKyxiL/Nx/20bTix7d2f0er0J7tUGPr 1RE9kg/mATdax4SAhzs2c6y3mC5YzXI8vvANgk/ARrI6cOGWe0ArKvNZzsOR7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698080164; a=rsa-sha256; cv=none; b=JJguca+uexKPYSDR6knZoWaF294PhEmZf8oO12eNNJWBivLGd9opQUEFnEtxDxq0o88PD+ rqaiSezw+rknm6ICVVy100WCKD2rip6gMioZ+ySysk6UvIjKWf17AhmX9RuptAeaZz53xJ 0G+A+W2EfIHTMYrcY9RT6yx5r+bF7K1NofSHViI7K12KhV3tF2cV26aMQeiiUSI+RUhx1z yTbFTMRAkNiIeEOlHu9Is0ISSMM3ACuvHXRUJ34nTB0yHDD9hN/Jz5KdhB0MlKO55TaP4Z p0hxgROFiQHCnFWp1be7r3SHEsdd63Y9Bz7dpySwO7g1p7fEShj0jkJGfu8ThA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698080164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c9L1i6LBzvRfrlen9XowmXvR81cPjK1w3zR8799vstw=; b=hlobepLpXEEOfwNIR+6HGXMCVeWYO6c1BdVHPiDklXeV0jDtBFbZ3Y0+uZmkESv41J27i8 vHm+q1vBn4CONTuBGnV1t5ehoA0VtoEBif+PkwNrDuqnvNm0JZ1UCYTb/jau6yLnwTrMYH u0kifyBE9yAqjCz3cuW6Df5eTnJvXjAfVddUteQMbbGtC6haX2ae+4H5PPTvtE3MUypp7Q 7CSCwYJMHgP7I+9JktOnTFoW4jmPcuiu27fopwyHpmtTHOGw4k7pYWCyREA3o3M3f+ABr0 Ic/h5zO9iFWIGbS2wGBptcAPv6zToyymcTcshxz0iIWzXZiyKREzghNmRoPpNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDhCm4yD2znvg; Mon, 23 Oct 2023 16:56:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39NGu4Rw012549; Mon, 23 Oct 2023 16:56:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NGu43k012546; Mon, 23 Oct 2023 16:56:04 GMT (envelope-from git) Date: Mon, 23 Oct 2023 16:56:04 GMT Message-Id: <202310231656.39NGu43k012546@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 89d10367e4eb - main - www/webkit2-gtk3: fix build with lld 17 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89d10367e4ebaa6c7a04bfe51da9911fa8f03fa7 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=89d10367e4ebaa6c7a04bfe51da9911fa8f03fa7 commit 89d10367e4ebaa6c7a04bfe51da9911fa8f03fa7 Author: Dimitry Andric AuthorDate: 2023-10-23 16:40:57 +0000 Commit: Dimitry Andric 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 >::s_didInitialize' failed: symbol not defined ld: error: version script assignment of 'global' to symbol 'bmalloc::PerThreadStorage >::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 >::s_didInitialize"; +- "bmalloc::PerThreadStorage >::s_key"; +- "bmalloc::vmPageSize()::cached"; + "WebKit::NetworkProcessMain(int, char**)"; + "WebKit::WebKitExtensionManager::initialize(WebKit::InjectedBundle*, API::Object*)"; + "WebKit::WebKitExtensionManager::singleton()";