Skip to content

Commit

Permalink
textproc/ripgrep: Unbreak with CPUTYPE=haswell and rust>=1.48.0
Browse files Browse the repository at this point in the history
error[E0432]: unresolved import `crate::arch::x86_64::_mm_shuffle_pi8`
   --> /usr/ports/textproc/ripgrep/work/ripgrep-12.1.1/cargo-crates/packed_simd-0.3.3/src/codegen/shuffle1_dyn.rs:40:29
    |
40  |                         use crate::arch::x86_64::_mm_shuffle_pi8;
    |                             ^^^^^^^^^^^^^^^^^^^^^---------------
    |                             |                    |
    |                             |                    help: a similar name exists in the module: `_mm_shuffle_epi8`
    |                             no `_mm_shuffle_pi8` in `arch::x86_64`
...
297 | impl_shuffle1_dyn!(u8x8);
    | ------------------------- in this macro invocation
    |

Pull in newer packed_simd crate to fix it.  Newer versions are
published as packed_simd_2 because the original author is MIA.

PR:		251425
Reported by:	Tomoaki AOKI <junchoon@dec.sakura.ne.jp>
  • Loading branch information
Tobias Kortkamp authored and Tobias Kortkamp committed Jun 14, 2021
1 parent a48771e commit db2cab4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 119 deletions.
7 changes: 5 additions & 2 deletions textproc/ripgrep/Makefile
Expand Up @@ -2,7 +2,7 @@

PORTNAME= ripgrep
DISTVERSION= 12.1.1
PORTREVISION= 11
PORTREVISION= 12
CATEGORIES= textproc

MAINTAINER= petteri.valkonen@iki.fi
Expand Down Expand Up @@ -43,12 +43,13 @@ CARGO_CRATES= aho-corasick-0.7.10 \
jemallocator-0.3.2 \
lazy_static-1.4.0 \
libc-0.2.71 \
libm-0.1.4 \
log-0.4.8 \
maybe-uninit-2.0.0 \
memchr-2.3.3 \
memmap-0.7.0 \
num_cpus-1.13.0 \
packed_simd-0.3.3 \
packed_simd_2-0.3.5 \
pcre2-0.2.3 \
pcre2-sys-0.2.2 \
pkg-config-0.3.17 \
Expand Down Expand Up @@ -106,6 +107,8 @@ SIMD_VARS_i386= RUSTFLAGS+="-C target-feature=+sse2"

post-patch:
@${REINPLACE_CMD} -e 's|OUT_DIR|RIPGREP_OUTDIR|' ${WRKSRC}/build.rs
@${RLN} ${CARGO_VENDOR_DIR}/packed_simd_2-* ${CARGO_VENDOR_DIR}/packed_simd
@${REINPLACE_CMD} 's/packed_simd_2/packed_simd/' ${CARGO_VENDOR_DIR}/packed_simd/Cargo.toml

post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rg
Expand Down
8 changes: 5 additions & 3 deletions textproc/ripgrep/distinfo
@@ -1,4 +1,4 @@
TIMESTAMP = 1590823673
TIMESTAMP = 1623587388
SHA256 (rust/crates/aho-corasick-0.7.10.tar.gz) = 8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada
SIZE (rust/crates/aho-corasick-0.7.10.tar.gz) = 111039
SHA256 (rust/crates/atty-0.2.14.tar.gz) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
Expand Down Expand Up @@ -47,6 +47,8 @@ SHA256 (rust/crates/lazy_static-1.4.0.tar.gz) = e2abad23fbc42b3700f2f279844dc832
SIZE (rust/crates/lazy_static-1.4.0.tar.gz) = 10443
SHA256 (rust/crates/libc-0.2.71.tar.gz) = 9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49
SIZE (rust/crates/libc-0.2.71.tar.gz) = 474209
SHA256 (rust/crates/libm-0.1.4.tar.gz) = 7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a
SIZE (rust/crates/libm-0.1.4.tar.gz) = 110593
SHA256 (rust/crates/log-0.4.8.tar.gz) = 14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7
SIZE (rust/crates/log-0.4.8.tar.gz) = 31297
SHA256 (rust/crates/maybe-uninit-2.0.0.tar.gz) = 60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00
Expand All @@ -57,8 +59,8 @@ SHA256 (rust/crates/memmap-0.7.0.tar.gz) = 6585fd95e7bb50d6cc31e20d4cf9afb4e2ba1
SIZE (rust/crates/memmap-0.7.0.tar.gz) = 15214
SHA256 (rust/crates/num_cpus-1.13.0.tar.gz) = 05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3
SIZE (rust/crates/num_cpus-1.13.0.tar.gz) = 14704
SHA256 (rust/crates/packed_simd-0.3.3.tar.gz) = a85ea9fc0d4ac0deb6fe7911d38786b32fc11119afd9e9d38b84ff691ce64220
SIZE (rust/crates/packed_simd-0.3.3.tar.gz) = 97485
SHA256 (rust/crates/packed_simd_2-0.3.5.tar.gz) = 0e64858a2d3733fdd61adfdd6da89aa202f7ff0e741d2fc7ed1e452ba9dc99d7
SIZE (rust/crates/packed_simd_2-0.3.5.tar.gz) = 98197
SHA256 (rust/crates/pcre2-0.2.3.tar.gz) = 85b30f2f69903b439dd9dc9e824119b82a55bf113b29af8d70948a03c1b11ab1
SIZE (rust/crates/pcre2-0.2.3.tar.gz) = 19605
SHA256 (rust/crates/pcre2-sys-0.2.2.tar.gz) = 876c72d05059d23a84bd9fcdc3b1d31c50ea7fe00fe1522b4e68cd3608db8d5b
Expand Down
114 changes: 0 additions & 114 deletions textproc/ripgrep/files/patch-packed_simd

This file was deleted.

0 comments on commit db2cab4

Please sign in to comment.