Attachment 199340 Details for Bug 233317 – v1

[patch] v1

ripgrep.pcre2.diff (text/plain), 2.00 KB, created by Jan Beich on 2018-11-19 12:16:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2018-11-19 12:16:37 UTC

Size: 2.00 KB

patch

obsolete

>From 4e529ecea628c35e14b6bb5e00468248a4d25235 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Mon, 19 Nov 2018 11:53:05 +0000
>Subject: [PATCH] textproc/ripgrep: enable PCRE2 support by default
>
>PR:		233316
>Approved by:	Petteri Valkonen (maintainer)
>---
> textproc/ripgrep/Makefile | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile
>index dcca091dda0f..ded966af5fea 100644
>--- a/textproc/ripgrep/Makefile
>+++ b/textproc/ripgrep/Makefile
>@@ -1,16 +1,16 @@
> # Created by: Petteri Valkonen <petteri.valkonen@iki.fi>
> # $FreeBSD$
> 
> # vim: ts=8 noet
> 
> PORTNAME=	ripgrep
> DISTVERSION=	0.10.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	textproc
> 
> MAINTAINER=	petteri.valkonen@iki.fi
> COMMENT=	Command line search tool
> 
> LICENSE=	MIT UNLICENSE
> LICENSE_COMB=	dual
> LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
>@@ -105,30 +105,35 @@ CARGO_ENV=	RIPGREP_OUTDIR=${RIPGREP_OUTDIR}
> PLIST_FILES=	bin/rg \
> 		etc/bash_completion.d/rg.bash \
> 		man/man1/rg.1.gz \
> 		share/fish/completions/rg.fish \
> 		share/zsh/site-functions/_rg
> 
> PORTDOCS=	CHANGELOG.md FAQ.md GUIDE.md
> 
>-OPTIONS_DEFINE=	DOCS SIMD
>+OPTIONS_DEFINE=	DOCS PCRE2 SIMD
>+OPTIONS_DEFAULT=PCRE2
> 
> OPTIONS_DEFINE_amd64=	AVX
> OPTIONS_DEFINE_i386=	AVX
> 
> OPTIONS_DEFAULT_aarch64=SIMD
> OPTIONS_DEFAULT_amd64=	${OPTIONS_DEFAULT_i386}
> OPTIONS_DEFAULT_i386=	${MACHINE_CPU:tu:S/SSE2/SIMD/}
> 
> AVX_DESC=	${SSE_DESC:S/SSE/AVX/}
> 
> AVX_VARS=	CARGO_FEATURES+=avx-accel RUSTFLAGS+="-C target-feature=+avx"
> AVX_IMPLIES=	SIMD
> 
>+PCRE2_DESC=	${PCRE_DESC} version 2
>+PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
>+PCRE2_VARS=	CARGO_FEATURES+=pcre2
>+
> # simd crate uses cfg_target_feature which isn't stable yet, so unlock
> # unstable features similar to how lang/rust bootstraps. www/firefox
> # uses the same hack when building with --enable-rust-simd.
> SIMD_MAKE_ENV=	RUSTC_BOOTSTRAP=1
> SIMD_VARS=	CARGO_FEATURES+=simd-accel ${SIMD_VARS_${ARCH}}
> SIMD_VARS_i386=	RUSTFLAGS+="-C target-feature=+sse2"
> 
> post-patch:

Actions: View | Diff

Attachments on bug 233317: 199340