Bug 251425
| Summary: | textproc/ripgrep: Fails to build after lang/rust is updated to 1.48.0 | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Tomoaki AOKI <junchoon> | ||||
| Component: | Individual Port(s) | Assignee: | Tobias Kortkamp <tobik> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | CC: | 0mp, fullermd, mikael, petteri.valkonen, rust, swills, val | ||||
| Priority: | --- | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
|
Description
Tomoaki AOKI
2020-11-27 14:07:04 UTC
do you have anything in make.conf? (In reply to Mikael Urankar from comment #1) Yes. As below, stripping commented out settings. But textproc/ripgrep was built successfully before lang/rust 1.48.0 with these settings. # Disable all debugging functionality on malloc for head. MALLOC_PRODUCTION=yes ## Some ports wants KERNCONF defined to build. ## So define here instead of src.conf. KERNCONF?=TEST15 WITH_NEW_MESA=yes TEX_DEFAULT= texlive .if !${.CURDIR:M/usr/src/sys/boot*} CPUTYPE?= haswell .endif OPTIONS_SET= I18N NLS CJK JAPANESE NVIDIA NVIDIA_GL GTK2 MMX SSE SSE2 SSE3 SSSE3 SSE4 SSE4.1 SSE4.2 AVX SIMD OPTIMIZED_FLAGS OPTIMIZED_CFLAGS WITH_NEW_XORG OPTIONS_UNSET= NOUVEAU .if ${.CURDIR:M/usr/ports/games/rubix} CPUTYPE= core .endif .if ${.CURDIR:M/usr/ports/lang/gcc} CPUTYPE= sandybridge .endif # Begin portconf settings # Do not touch these lines .if !empty(.CURDIR:M/usr/ports*) && exists(/usr/local/libexec/portconf) _PORTCONF!=/usr/local/libexec/portconf .for i in ${_PORTCONF:S/|/ /g} ${i:S/%/ /g} .endfor .endif # End portconf settings DEFAULT_VERSIONS+= ssl=base DEFAULT_VERSIONS+= bdb=5 DEFAULT_VERSIONS+= linux=c7 # Set preferred java version JAVA_PREFERRED_PORTS=JAVA_PORT_NATIVE_OPENJDK_JDK_1_8 One thing to note. This seems to be the same issue as bug 251356, but it was focused on firefox only and fixed on firefox, not rust. So I newly opened this PR. Created attachment 220040 [details]
v1
Can you test this patch?
https://github.com/BurntSushi/ripgrep/commit/3ef63dacbed48e9c569722059922f37964a9494e is the upstream commit that would wind up being the fix in the next release, if that would be better to use as a patch base. (In reply to Mikael Urankar from comment #4) Confirmed fixed both on stable/12 (amd64) at r368123 and on head (amd64) at r368125. Thanks! (In reply to fullermd from comment #5) Yes, it would be better, if there's any difference. I'm currently not enough familiar both with git(hub) and rust to check. But anyway, the patch would be removed once new version containing upstream fix is released and ports gets updated. So this fix should be better than nothing, unless new upstream version would be released shortly enough. (In reply to fullermd from comment #5) it depends on other commits and it'll be very tedious to use this particular commit. *** Bug 251590 has been marked as a duplicate of this bug. *** ripgrep seems to build fine now. I'm closing this PR for now. Reopen. Still fails without the patch at least on commit below. git <src> <139576030ff3> stable/13, amd64 git <ports> <26faf5597798> A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=db2cab46a53e97833b2368cd4ee04e792a5c72f4 commit db2cab46a53e97833b2368cd4ee04e792a5c72f4 Author: Tobias Kortkamp <tobik@FreeBSD.org> AuthorDate: 2021-06-13 12:38:06 +0000 Commit: Tobias Kortkamp <tobik@FreeBSD.org> CommitDate: 2021-06-14 20:51:05 +0000 textproc/ripgrep: Unbreak with CPUTYPE=haswell and rust>=1.48.0 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> textproc/ripgrep/Makefile | 7 +- textproc/ripgrep/distinfo | 8 +- textproc/ripgrep/files/patch-packed_simd (gone) | 114 ------------------------ 3 files changed, 10 insertions(+), 119 deletions(-) Should be fixed by the last commit and also the ripgrep 13.0.0 update. |
