From nobody Tue Oct 24 10:23:14 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 4SF7S24C7Pz4xrNB; Tue, 24 Oct 2023 10:23:14 +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 4SF7S23Z7qz4FkP; Tue, 24 Oct 2023 10:23:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698142994; 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=IynqoejN6GZSrike2/s6UCzUCXTzYfu832Oe9NM8G/Y=; b=M+HN4EV6KP0njdbAzqyYSqF4V90bUSjZPqSWUQPQ+lXWb15SlOQymbKmnR2pywQElOKs6A 1E0eI1caG0jKYhtVqLa1TBe+//+BDsKAmKMa7+5WGKKF+vIxZFCibw9utnXpFeKlMAbO/2 3bD8O1ooWd0Gxpp/MuCxqHoSI1hdCNjAxJ0OdwiAmt6XeP1/tcwpqJD1C8mEKLbYuayosr Hwoo4jrGps8TYX9JfThQCH0sUXVqMR5nlsrb+uBAXXwwQ1TgEYlioSkkX6Mpfl9tmqC1U6 jAkc0qXBEj4fPhiD8DRpJYQDoON2BIBLtNSXpac42M+wZNEbKkJIAzPI1jYJoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698142994; a=rsa-sha256; cv=none; b=dBdktftESq8grDbU4C1IkiPVmdNPwox5UPHkjp4GXsbkrQwmT+PW+jaHVTnkEJjIGicyVf DJtH2/F9OunaGUfig4r+MMBQZrnW5GAi9I/Wd1Jd50Auo6zuw8qDPTzlY5qWsq5p6fVNQ/ UWfv4tspGYuKipz17ezsQdpDAw/46muw7appT0705MZtDbJJND6PFJPzSWAA3wg0NWYqNu KtnSz91BRuxusHT7UBJHq0XffMQFlFVp0jCDJgBByl+8khu4Lt52wt+l9QOzbO+UwxQOH6 N0lvEA+ckBn/iLKgDisZoY2BD3rFFKxSa0sQlcIL9Wi9QafTOKrxeqObxx3zmw== 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=1698142994; 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=IynqoejN6GZSrike2/s6UCzUCXTzYfu832Oe9NM8G/Y=; b=aBZVKcvd/gBEOJKJxhLMdY/vu3OIvku2JYZawyWJ763M9HDrR/VLOfGkHNU7PQ1QSBCGa3 NpHfm0vu8bq/jXit/WPEHLpWYD5/344b2cc1YopFHFuksKca/k1HymfS3PSBvx06Ime6vG 29HnmiTYc3cifNCb28diRKInpeM/r4tP4KGgJiegdxKVWMj15k6G7AUpV2uZaQ6Nu3v++x IurTdHIcL95t56j01qSAOXHHsap5g4sMJ+fVLSIWXJwGQkPAwPIZ3cjkjhL3ioz2/tJAyw gCb5EwraCYgWlDbTZkcuizviovVBy2yF3cbstC2r9SgQKFGG2zSoL6u60LP4Bw== 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 4SF7S22g7Jz3y3; Tue, 24 Oct 2023 10:23:14 +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 39OANEJx070625; Tue, 24 Oct 2023 10:23:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OANEl0070622; Tue, 24 Oct 2023 10:23:14 GMT (envelope-from git) Date: Tue, 24 Oct 2023 10:23:14 GMT Message-Id: <202310241023.39OANEl0070622@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: b71e4863289c - main - textproc/ripgrep: 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: b71e4863289c2bb6bf17ef1141f1305488d1b82d Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=b71e4863289c2bb6bf17ef1141f1305488d1b82d commit b71e4863289c2bb6bf17ef1141f1305488d1b82d Author: Mikael Urankar AuthorDate: 2023-10-16 08:56:30 +0000 Commit: Mikael Urankar CommitDate: 2023-10-24 10:21:44 +0000 textproc/ripgrep: 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 ripgrep 13.0.0 Backport [3] to fix the following issue: error: unrecognized platform-specific intrinsic function: `simd_shuffle2` --> /wrkdirs/usr/ports/textproc/ripgrep/work/ripgrep-13.0.0/cargo-crates/packed_simd_2-0.3.8/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) --- textproc/ripgrep/files/patch-rust-1.73.0 | 83 ++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/textproc/ripgrep/files/patch-rust-1.73.0 b/textproc/ripgrep/files/patch-rust-1.73.0 new file mode 100644 index 000000000000..c80b7ea2c842 --- /dev/null +++ b/textproc/ripgrep/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 +--- cargo-crates/packed_simd_2-0.3.8/src/codegen/llvm.rs ++++ cargo-crates/packed_simd_2-0.3.8/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" {