From nobody Tue Oct 24 10:23:13 2023 X-Original-To: dev-commits-ports-main@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 4SF7S13CyZz4xrJH; Tue, 24 Oct 2023 10:23:13 +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 4SF7S12k3rz4FgN; Tue, 24 Oct 2023 10:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698142993; 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=lGTzGhaCXqzBcf0/aadUR0C0EfLKRnF+7TRiSUN/JKU=; b=yB0M/ChCbvZeg66MSCl6gZFBpsySnwDPoMvqEWNalgxosPhE4pob6DLZtvyGIF4Ef735gW ylRmxBZL8c0y73LX4Dm0Sdiw6qzvXyOtGWmudeExbHgUV2ivLyNj35j98gKEGZv/0zd2Tj gjHuf6anrM/B5jQMbKtbqEiaYAD5mHWJoWtODxesEVE9KzTzuh4sBUsjNDcf57EG9EAN8u Way6ZG6WovIy48l/qmdAH5xFNdcmUbs6gU2Apx6br21DjPDTRasjmlrlSonaFw8NsTM88X yYqdeBhjq6J5Kk6ZS7M2pIf+KRQRbuQwsR7hfaKzIVz+Mr9HomszCcoJtyR/7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698142993; a=rsa-sha256; cv=none; b=rbvJ1sK5WRES9VJfgcrxNvPGEkqbVYVnBrnv5hdcR/GW0Fci7Iy6658v0yMEpvM05reKsf B/+QSD5PzSbS7TiXGpoMs0wHm2LbjucKoDqPnc/C40BkdG3GcyDInBzBc9SJANm+pUbxvO twcZNPOyJR6dqoIWkSbxd2GnVbscKBceIWlrKz8/gnE+JqUH7hcT3sn42Z//oTNmGMcZ0c 8iQ4yCcsyXgSX8aB/aykrENJV09Jzk3Z3dl3Zqq6ruH0FstlEG7BSDmXCU1BzUrnjrzf9x 1GaBvHyyEm5ZNsnWf494J/ISBjjEbwXfzT+38jJVlrvYSqbTTQki7V1QJ7tsXw== 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=1698142993; 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=lGTzGhaCXqzBcf0/aadUR0C0EfLKRnF+7TRiSUN/JKU=; b=S2I519w8AB2Hz0rHShdeWd0Lzaq7aVKqNZ8HzzjTdUnLtkOF+wQt9vxFqojgInJgovH9qb qvWOIL+1ZvHAFMfEHbDODGe6KcO6P+nNLog1amS0OqvO6Dh37ynuUUrTHTVt7+eBaWqd73 eHbnPKv26ic+zxpP8HrrBVNJlLnN0o7qDUUVrl5hb/OcXpDB24+uvLTIlr3onpr3dQmu01 9JzkAaBGk2K7zfLDxnPBgW8rfYNHy8pArs/e4uMP5DKYg9imUymoHvkHcjTxWLv2oNxKAj ko5vTpLP/Obo4QzOdGhzF+i3vY1rSik6jHFtz5S3Y/Eef3NZqtIaQPysh5pWAw== 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 4SF7S11gdgz4Dm; Tue, 24 Oct 2023 10:23:13 +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 39OAND0b070575; Tue, 24 Oct 2023 10:23:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OANDcO070572; Tue, 24 Oct 2023 10:23:13 GMT (envelope-from git) Date: Tue, 24 Oct 2023 10:23:13 GMT Message-Id: <202310241023.39OANDcO070572@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: ff2bf59cd9ed - main - www/librewolf: fix build with rust 1.73.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: ff2bf59cd9ed84710f7afa42f348250d09a8131c Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=ff2bf59cd9ed84710f7afa42f348250d09a8131c commit ff2bf59cd9ed84710f7afa42f348250d09a8131c Author: Mikael Urankar AuthorDate: 2023-10-15 17:58:51 +0000 Commit: Mikael Urankar CommitDate: 2023-10-24 10:21:40 +0000 www/librewolf: 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 librewolf 117 Backport [3] to fix the following issue: error: unrecognized platform-specific intrinsic function: `simd_shuffle2` --> /wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/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/librewolf/files/patch-rust-1.73.0 | 83 +++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/www/librewolf/files/patch-rust-1.73.0 b/www/librewolf/files/patch-rust-1.73.0 new file mode 100644 index 000000000000..b838ffd90d28 --- /dev/null +++ b/www/librewolf/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" {