From nobody Fri Apr 08 14:34:28 2022 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 ED3B61AA85C1; Fri, 8 Apr 2022 14:34:28 +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 4KZgkD6KMzz4X3H; Fri, 8 Apr 2022 14:34:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649428468; 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=ag1Q/sfHCd9L9OqoED52pjwS5gUnqMBGsomxNld9MLo=; b=SCuqdqdbt9K23TYUafcJ/XGPSDoVafxTluI/kFEekxG0BPlWcfFfV6Yz5WgRaHN+R1xHeV Y5PfXPD/HOxS49e/4y+93p+IugXVcDG0CsMxh5qWk+KCeOXUoniJ6xO6Endh+NYlCwAQIS unIElGFepjRAp2HIhVZksMajgVohSO/BTcYvT58AJTK3VPf0oA9UljwZ0vClNnG8ZOTiLl rmlYdNFbEDfOJqZtY4+5ELwNxqVu33Nm96q5wsvxZtKTe3mOIbiXmPAT5mmLu9neUqAxIp +FTxp+YQ3vdAla2RnygjNzVgvi+oJq05D9P9dPlFlj2aW18haeeEM+WmYMLZnw== 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 B8B0826C94; Fri, 8 Apr 2022 14:34:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 238EYSaS059792; Fri, 8 Apr 2022 14:34:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 238EYSZ2059791; Fri, 8 Apr 2022 14:34:28 GMT (envelope-from git) Date: Fri, 8 Apr 2022 14:34:28 GMT Message-Id: <202204081434.238EYSZ2059791@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: 6232f9ef95a4 - main - textproc/ripgrep: Update packed_simd_2 crate 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: 6232f9ef95a4a7df474752319b00f91c5dded612 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649428468; 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=ag1Q/sfHCd9L9OqoED52pjwS5gUnqMBGsomxNld9MLo=; b=aQeibC0aPSyyu4hSHl1Qdpz+OuXt8AHjq5WZ+6LLHW7cUSxCaeNqNJ92UCsYa7qWZaor/9 QopRAB+PubJVbkzrNeIcSejfbdkN4weNZ9A7slzA9kIiHoF/OnRsLNTFv62/C17e1ameso q/z6jap/oqrwhkAdm/hbj7ZkPTQ2g03qgMGOzm4TWPJ4dTuPdi/UEcXFpgSjLU5aaGdRxF OahlhPfvEjX6aFjqWbr6NgsZrVwbVi1LUDZTFdBUK4uGvkb6Bgt3NS9P58+5b9n14FEi7F OP7zkGPPbgOxh4EqmdBQD8rau5bGuNlngoyyezFBfVTGAg9qgpDOVPKC8VB3cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649428468; a=rsa-sha256; cv=none; b=A4Ms+ymNoVFSeAposWmNS0t8vHrroPUgN/zAqiOD1TLOALeOmS+vRxsNMFn7JV2y1gn0N+ MN6Tyd/mgriojzjUS8CKxz6cGGcnzsmEn7cyczohPcUKI5qeTF7PheXOtrw8a0y3b7ItfF xGcuIKBSaKVmH3R1kCG9tBMKYyEu4ozr9RQ3ztBgAw5jaW2XUA/RGcKaii93dAMVOdrwYS YkRUoo9gWjGGKLqLk/XQvO9Fns4iltEvvxBybEtOod1aTtcuaj7/uRB77w61y5I3NkH0Sq 2BcLdeOgB8H591X3a+K2CVJF5jwZ9clStAUWlY/AjiGP2fgyMqW2LHg5tYr69Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=6232f9ef95a4a7df474752319b00f91c5dded612 commit 6232f9ef95a4a7df474752319b00f91c5dded612 Author: Mikael Urankar AuthorDate: 2022-04-08 13:31:31 +0000 Commit: Mikael Urankar CommitDate: 2022-04-08 14:33:11 +0000 textproc/ripgrep: Update packed_simd_2 crate It fixes the build with the upcoming rust 1.60.0 update error message: error[E0635]: unknown feature `llvm_asm` --> /wrkdirs/usr/ports/textproc/ripgrep/work/ripgrep-13.0.0/cargo-crates/packed_simd_2-0.3.6/src/lib.rs:227:5 Approved by: portmgr (build fix blanket) --- textproc/ripgrep/Makefile | 4 +-- textproc/ripgrep/distinfo | 6 ++-- textproc/ripgrep/files/patch-rust-1.60 | 66 ++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 5 deletions(-) diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile index 9dd1733fca2b..8310b2846f81 100644 --- a/textproc/ripgrep/Makefile +++ b/textproc/ripgrep/Makefile @@ -2,7 +2,7 @@ PORTNAME= ripgrep DISTVERSION= 13.0.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= textproc MAINTAINER= petteri.valkonen@iki.fi @@ -59,7 +59,7 @@ CARGO_CRATES= aho-corasick-0.7.18 \ memmap2-0.3.0 \ num_cpus-1.13.0 \ once_cell-1.7.2 \ - packed_simd_2-0.3.6 \ + packed_simd_2-0.3.7 \ pcre2-0.2.3 \ pcre2-sys-0.2.5 \ pkg-config-0.3.19 \ diff --git a/textproc/ripgrep/distinfo b/textproc/ripgrep/distinfo index 200b77ccd869..e679a2224575 100644 --- a/textproc/ripgrep/distinfo +++ b/textproc/ripgrep/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1634590373 +TIMESTAMP = 1649425059 SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f SIZE (rust/crates/aho-corasick-0.7.18.crate) = 112923 SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8 @@ -77,8 +77,8 @@ SHA256 (rust/crates/num_cpus-1.13.0.crate) = 05499f3756671c15885fee9034446956fff SIZE (rust/crates/num_cpus-1.13.0.crate) = 14704 SHA256 (rust/crates/once_cell-1.7.2.crate) = af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3 SIZE (rust/crates/once_cell-1.7.2.crate) = 28250 -SHA256 (rust/crates/packed_simd_2-0.3.6.crate) = 71c0c06716cfc81616fa8e22b721ce92fecd594508bc0eb3d04ae3ef35ac10c5 -SIZE (rust/crates/packed_simd_2-0.3.6.crate) = 98119 +SHA256 (rust/crates/packed_simd_2-0.3.7.crate) = defdcfef86dcc44ad208f71d9ff4ce28df6537a4e0d6b0e8e845cb8ca10059a6 +SIZE (rust/crates/packed_simd_2-0.3.7.crate) = 97413 SHA256 (rust/crates/pcre2-0.2.3.crate) = 85b30f2f69903b439dd9dc9e824119b82a55bf113b29af8d70948a03c1b11ab1 SIZE (rust/crates/pcre2-0.2.3.crate) = 19605 SHA256 (rust/crates/pcre2-sys-0.2.5.crate) = dec30e5e9ec37eb8fbf1dea5989bc957fd3df56fbee5061aa7b7a99dbb37b722 diff --git a/textproc/ripgrep/files/patch-rust-1.60 b/textproc/ripgrep/files/patch-rust-1.60 new file mode 100644 index 000000000000..f0010da169ba --- /dev/null +++ b/textproc/ripgrep/files/patch-rust-1.60 @@ -0,0 +1,66 @@ +--- Cargo.lock.orig 2022-04-08 15:28:37 UTC ++++ Cargo.lock +@@ -62,12 +62,6 @@ name = "cfg-if" + + [[package]] + name = "cfg-if" +-version = "0.1.10" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +- +-[[package]] +-name = "cfg-if" + version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +@@ -90,7 +84,7 @@ dependencies = [ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "crossbeam-utils", + ] + +@@ -100,7 +94,7 @@ dependencies = [ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "lazy_static", + ] + +@@ -110,7 +104,7 @@ dependencies = [ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "packed_simd_2", + ] + +@@ -329,7 +323,7 @@ dependencies = [ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + ] + + [[package]] +@@ -365,11 +359,11 @@ name = "packed_simd_2" + + [[package]] + name = "packed_simd_2" +-version = "0.3.5" ++version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0e64858a2d3733fdd61adfdd6da89aa202f7ff0e741d2fc7ed1e452ba9dc99d7" ++checksum = "defdcfef86dcc44ad208f71d9ff4ce28df6537a4e0d6b0e8e845cb8ca10059a6" + dependencies = [ +- "cfg-if 0.1.10", ++ "cfg-if", + "libm", + ] +