Attachment 187710 Details for Bug 223415 – v0

[patch] v0

rust.i386.no-sse2.diff (text/plain), 3.66 KB, created by Jan Beich on 2017-11-04 06:54:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2017-11-04 06:54:24 UTC

Size: 3.66 KB

patch

obsolete

>From 675fd1abd17f09a4976ffab4b4ed9cdfda352c8c Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sat, 4 Nov 2017 05:31:17 +0000
>Subject: [PATCH] lang/rust: don't require SSE2 on i386 for package
>
>PR:		223415
>Approved by:	rust !!! NOT YET !!!
>---
> Mk/bsd.gecko.mk                                               |  2 +-
> lang/rust/Makefile                                            |  2 +-
> .../patch-src_librustc__back_target_i686__unknown__freebsd.rs | 11 +++++++++++
> textproc/ripgrep/Makefile                                     |  6 +++---
> www/firefox/Makefile                                          |  2 +-
> 5 files changed, 17 insertions(+), 6 deletions(-)
> create mode 100644 lang/rust/files/patch-src_librustc__back_target_i686__unknown__freebsd.rs
>
>diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
>index 3852eb0d5fad..1260b32c6e13 100644
>--- a/Mk/bsd.gecko.mk
>+++ b/Mk/bsd.gecko.mk
>@@ -400,7 +400,7 @@ MOZ_OPTIONS+=	--enable-debug --disable-release
> STRIP=	# ports/184285
> .else
> MOZ_OPTIONS+=	--disable-debug --disable-debug-symbols --enable-release
>-. if ${MOZILLA_VER:R:R} >= 56
>+. if ${MOZILLA_VER:R:R} >= 56 && ${ARCH:Ni386}
> MOZ_OPTIONS+=	--enable-rust-simd
> . endif
> .endif
>diff --git a/lang/rust/Makefile b/lang/rust/Makefile
>index 2bf85361a4e3..440bd8138076 100644
>--- a/lang/rust/Makefile
>+++ b/lang/rust/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	rust
> PORTVERSION?=	1.21.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	lang
> MASTER_SITES=	http://static.rust-lang.org/dist/:src \
> 		LOCAL/dumbbell/rust:rust_bootstrap \
>diff --git a/lang/rust/files/patch-src_librustc__back_target_i686__unknown__freebsd.rs b/lang/rust/files/patch-src_librustc__back_target_i686__unknown__freebsd.rs
>new file mode 100644
>index 000000000000..47f594784f7e
>--- /dev/null
>+++ b/lang/rust/files/patch-src_librustc__back_target_i686__unknown__freebsd.rs
>@@ -0,0 +1,11 @@
>+--- src/librustc_back/target/i686_unknown_freebsd.rs.orig	2017-10-09 20:04:51 UTC
>++++ src/librustc_back/target/i686_unknown_freebsd.rs
>+@@ -13,7 +13,7 @@ use target::{Target, TargetResult};
>+ 
>+ pub fn target() -> TargetResult {
>+     let mut base = super::freebsd_base::opts();
>+-    base.cpu = "pentium4".to_string();
>++    base.cpu = "pentiumpro".to_string();
>+     base.max_atomic_width = Some(64);
>+     base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m32".to_string());
>+     base.stack_probes = true;
>diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile
>index 19dc86a90a29..1d3d4e0560e2 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
>@@ -75,7 +75,7 @@ RIPGREP_OUTDIR=	${WRKDIR}/cargo-out
> CARGO_ENV=	RIPGREP_OUTDIR=${RIPGREP_OUTDIR}
> 
> OPTIONS_DEFINE=	SIMD
>-OPTIONS_DEFAULT=SIMD
>+OPTIONS_DEFAULT=${ARCH:Ni386:C/.+/SIMD/}
> 
> OPTIONS_DEFINE_amd64=	AVX
> OPTIONS_DEFINE_i386=	AVX
>@@ -88,7 +88,7 @@ AVX_IMPLIES=	SIMD
> # 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=	CARGO_FEATURES+=simd-accel RUSTFLAGS+="-C target-feature=+sse2"
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|OUT_DIR|RIPGREP_OUTDIR|' ${WRKSRC}/build.rs
>diff --git a/www/firefox/Makefile b/www/firefox/Makefile
>index 0ef49ccf408d..659e9fe0d5d3 100644
>--- a/www/firefox/Makefile
>+++ b/www/firefox/Makefile
>@@ -4,7 +4,7 @@
> PORTNAME=	firefox
> DISTVERSION=	56.0.2
> DISTVERSIONSUFFIX=.source
>-PORTREVISION=	6
>+PORTREVISION=	7
> PORTEPOCH=	1
> CATEGORIES=	www ipv6
> MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \

Actions: View | Diff

Attachments on bug 223415: 187710