diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2017-11-11 19:01:55 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2017-11-11 19:01:55 +0000 |
| commit | 092331814f4f425e69cd14a20e33c1f5736aae84 (patch) | |
| tree | dd60936e08382d39930f19b659a00f9841b1cebc /textproc/ripgrep | |
| parent | f0cb8a6da2d8cd61fa47ede6da78543b0ad29c3a (diff) | |
| download | ports-092331814f4f425e69cd14a20e33c1f5736aae84.tar.gz ports-092331814f4f425e69cd14a20e33c1f5736aae84.zip | |
textproc/ripgrep: Restore BASH, FISH, ZSH options
They were broken by r453382 which introduced new AVX, SIMD options
which overwrote the old ones.
PR: 223478, 223314
Submitted by: petteri.valkonen@iki.fi (maintainer)
Notes
Notes:
svn path=/head/; revision=453990
Diffstat (limited to 'textproc/ripgrep')
| -rw-r--r-- | textproc/ripgrep/Makefile | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile index 19dc86a90a29..97808454c5d8 100644 --- a/textproc/ripgrep/Makefile +++ b/textproc/ripgrep/Makefile @@ -5,7 +5,7 @@ PORTNAME= ripgrep PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= petteri.valkonen@iki.fi @@ -20,16 +20,6 @@ USES= cargo USE_GITHUB= yes GH_ACCOUNT= BurntSushi -OPTIONS_DEFINE= BASH FISH ZSH -OPTIONS_DEFAULT=BASH FISH ZSH -FISH_DESC= Install programmable completions for Fish - -PLIST_FILES= bin/rg \ - man/man1/rg.1.gz -BASH_PLIST_FILES= etc/bash_completion.d/rg.bash-completion -FISH_PLIST_FILES= share/fish/completions/rg.fish -ZSH_PLIST_FILES= share/zsh/site-functions/_rg - CARGO_CRATES= aho-corasick-0.6.3 \ ansi_term-0.9.0 \ atty-0.2.3 \ @@ -74,22 +64,32 @@ CARGO_CRATES= aho-corasick-0.6.3 \ RIPGREP_OUTDIR= ${WRKDIR}/cargo-out CARGO_ENV= RIPGREP_OUTDIR=${RIPGREP_OUTDIR} -OPTIONS_DEFINE= SIMD -OPTIONS_DEFAULT=SIMD +PLIST_FILES= bin/rg \ + man/man1/rg.1.gz + +OPTIONS_DEFINE= BASH FISH ZSH SIMD +OPTIONS_DEFAULT=BASH FISH ZSH SIMD OPTIONS_DEFINE_amd64= AVX OPTIONS_DEFINE_i386= AVX AVX_DESC= ${SSE_DESC:S/SSE/AVX/} +FISH_DESC= Install programmable completions for Fish + AVX_VARS= CARGO_FEATURES+=avx-accel RUSTFLAGS+="-C target-feature=+avx" AVX_IMPLIES= SIMD +BASH_PLIST_FILES= etc/bash_completion.d/rg.bash-completion +FISH_PLIST_FILES= share/fish/completions/rg.fish + # 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 +ZSH_PLIST_FILES= share/zsh/site-functions/_rg + post-patch: @${REINPLACE_CMD} -e 's|OUT_DIR|RIPGREP_OUTDIR|' ${WRKSRC}/build.rs |