From nobody Tue Oct 24 10:23:12 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 4SF7S02Rf2z4xrKf; Tue, 24 Oct 2023 10:23:12 +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 4SF7S021Zcz4FjL; Tue, 24 Oct 2023 10:23:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698142992; 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=j1rnSfmKATYYPO3wHYdr7vPnaQrGmdsYbzOQ6LhHxFU=; b=Rgnfy1/iZ2OuGG7xuQJZkWVwyANsh4gT8NK4tdAXffU9tzz9+v6ppnbW+Ss6rbwadXixHR An3E9UuIwyAOJnlPaga0/D4j9QxahJXPHXeSIdfZJGrFfHgSGjmWMV33TsbKmh91FzAimZ JMn+3DDQwXyrht4itwzrAOY+1und4Ooq3DE4rTlVGvcnraBpEzac6q4sP60T0Npn9W3FOx yYERHyDqf7GN11EcMi7MyrxtktgpzhC/LU5zgUor8fp7jPPBEYN2u8NoTAfvc4W6N/CMUj dnuTxbuTzMTqvRBGgmuTub1VJgfXTvv36IASae6KXUmkq9K9vLDqVNfFW2v4cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698142992; a=rsa-sha256; cv=none; b=o3qRcL/HbeH3tpP4FVWlF1psBTbxhpicGP3ZpIJJiHeCPRmdnB5PorxShl5ryYjAaQ2QLF aMPJ6cdETZnR1kVyiR6d5NPyRByMPFYiHUBPPa0vfX8iuO7Xz7jlT+WUNmBBSUo92PD1xL GFQMcT6Oxeb7u1ZO55RaEEJCP5iMbsiktGdW5omULn8OY1+dFaFv357+S4/gcv4cijphw0 zjOfnInNUfsTbrzjlbDl0uWP7N5kTkSTzDla+TKVoJM0ecRORkMKH4/QAgDXsu6IvB+33U 7nsa4hDu/sFtF3PeKJ9I9Oi1NLOmMcpPHeri6sZMxJVfofceCPJiX5hsbtttCA== 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=1698142992; 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=j1rnSfmKATYYPO3wHYdr7vPnaQrGmdsYbzOQ6LhHxFU=; b=TASJ02Gz2tlqapWiNkmDBjweT6oJo9qaQzzFk19S441ZHVBTuDgJwC8wLy9qVojzmdbWDK WqFktGy+WUrx3DT8V6HMP/yV+dQEh7nZiH6/vDKbZKmMe+jVjTe7c0PtiSRMmi/+eQ3Vcf 3Yxp1m5yf1GTLKaWMvv9f7g1dLJ0yHJqIIGFbvo28byxBrWlYGbX4fYpiOr4P4HAHqT8Uq xEJlCIowUHKdM+6IFtjHeL5F1g5HEQORGsO7iHgIbruERTtFsIrn/+W3sGbCfBtK+7reJT 8jEJAef45b81m37gWn+nPjg4KsVTy1y2OO0QiT5ZagysTLaiyZHlTfM5atFXZA== 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 4SF7S014Vwz4XC; Tue, 24 Oct 2023 10:23:12 +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 39OANCiN070525; Tue, 24 Oct 2023 10:23:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OANCO1070522; Tue, 24 Oct 2023 10:23:12 GMT (envelope-from git) Date: Tue, 24 Oct 2023 10:23:12 GMT Message-Id: <202310241023.39OANCO1070522@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 1c6457a0a625 - main - www/tor-browser: fix build with rust 1.73.0 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: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c6457a0a6250595d188eb57b6ee599d03c8d206 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c6457a0a6250595d188eb57b6ee599d03c8d206 commit 1c6457a0a6250595d188eb57b6ee599d03c8d206 Author: Mikael Urankar AuthorDate: 2023-10-15 17:58:23 +0000 Commit: Mikael Urankar CommitDate: 2023-10-24 10:21:38 +0000 www/tor-browser: fix build with rust 1.73.0 The crate packed_simd_2 is not maintained anymore. firefox switched to packed_simd [1] in [2] but it's not yet part of tor-browser 12.0.6 Backport [3] to fix the following issue: error: unrecognized platform-specific intrinsic function: `simd_shuffle2` --> /wrkdirs/usr/ports/www/tor-browser/work/firefox-tor-browser-102.11.0esr-12.0-1-build1/third_party/rust/packed_simd_2/src/codegen/llvm.rs:10:5 | 10 | pub fn simd_shuffle2(x: T, y: T, idx: [u32; 2]) -> U; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [1] https://github.com/rust-lang/packed_simd/ [2] https://github.com/mozilla/gecko-dev/commit/1e1bec8c6e383abf667d64ba1e556a4e68833f28 [3] https://github.com/rust-lang/packed_simd/commit/a79edf4cfc54aad30a5630b217645c4b8274d8f7 PR: 274499 Approved by: portmgr (build fix blanket) --- www/tor-browser/files/patch-rust-1.73.0 | 83 +++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/www/tor-browser/files/patch-rust-1.73.0 b/www/tor-browser/files/patch-rust-1.73.0 new file mode 100644 index 000000000000..b838ffd90d28 --- /dev/null +++ b/www/tor-browser/files/patch-rust-1.73.0 @@ -0,0 +1,83 @@ +From a79edf4cfc54aad30a5630b217645c4b8274d8f7 Mon Sep 17 00:00:00 2001 +From: Oli Scherer +Date: Mon, 10 Jul 2023 09:46:53 +0000 +Subject: [PATCH] Stop using old-style `simd_shuffle` + +--- + src/codegen/llvm.rs | 20 +++++++------------- + 1 file changed, 7 insertions(+), 13 deletions(-) + +diff --git third_party/rust/packed_simd_2/src/codegen/llvm.rs third_party/rust/packed_simd_2/src/codegen/llvm.rs +index b4c09849..bb482fac 100644 +--- third_party/rust/packed_simd_2/src/codegen/llvm.rs ++++ third_party/rust/packed_simd_2/src/codegen/llvm.rs +@@ -5,14 +5,8 @@ use crate::sealed::Shuffle; + #[allow(unused_imports)] // FIXME: spurious warning? + use crate::sealed::Simd; + +-// Shuffle intrinsics: expanded in users' crates, therefore public. + extern "platform-intrinsic" { +- pub fn simd_shuffle2(x: T, y: T, idx: [u32; 2]) -> U; +- pub fn simd_shuffle4(x: T, y: T, idx: [u32; 4]) -> U; +- pub fn simd_shuffle8(x: T, y: T, idx: [u32; 8]) -> U; +- pub fn simd_shuffle16(x: T, y: T, idx: [u32; 16]) -> U; +- pub fn simd_shuffle32(x: T, y: T, idx: [u32; 32]) -> U; +- pub fn simd_shuffle64(x: T, y: T, idx: [u32; 64]) -> U; ++ fn simd_shuffle(x: T, y: T, idx: I) -> U; + } + + #[allow(clippy::missing_safety_doc)] +@@ -22,7 +16,7 @@ where + T: Simd, + ::Element: Shuffle<[u32; 2], Output = U>, + { +- simd_shuffle2(x, y, IDX) ++ simd_shuffle(x, y, IDX) + } + + #[allow(clippy::missing_safety_doc)] +@@ -32,7 +26,7 @@ where + T: Simd, + ::Element: Shuffle<[u32; 4], Output = U>, + { +- simd_shuffle4(x, y, IDX) ++ simd_shuffle(x, y, IDX) + } + + #[allow(clippy::missing_safety_doc)] +@@ -42,7 +36,7 @@ where + T: Simd, + ::Element: Shuffle<[u32; 8], Output = U>, + { +- simd_shuffle8(x, y, IDX) ++ simd_shuffle(x, y, IDX) + } + + #[allow(clippy::missing_safety_doc)] +@@ -52,7 +46,7 @@ where + T: Simd, + ::Element: Shuffle<[u32; 16], Output = U>, + { +- simd_shuffle16(x, y, IDX) ++ simd_shuffle(x, y, IDX) + } + + #[allow(clippy::missing_safety_doc)] +@@ -62,7 +56,7 @@ where + T: Simd, + ::Element: Shuffle<[u32; 32], Output = U>, + { +- simd_shuffle32(x, y, IDX) ++ simd_shuffle(x, y, IDX) + } + + #[allow(clippy::missing_safety_doc)] +@@ -72,7 +66,7 @@ where + T: Simd, + ::Element: Shuffle<[u32; 64], Output = U>, + { +- simd_shuffle64(x, y, IDX) ++ simd_shuffle(x, y, IDX) + } + + extern "platform-intrinsic" {