svn commit: r452748 - in head: lang/rust lang/rust/files www/firefox www/firefox/files

[Jan Beich]

Author: jbeich
Date: Mon Oct 23 22:58:48 2017
New Revision: 452748
URL: https://svnweb.freebsd.org/changeset/ports/452748

Log:
  lang/rust: unbreak FFI for returning struct on i386
  
  As this fixes Stylo on i386, remove the workaround in www/firefox.
  
  PR:		223047
  Suggested by:	Sebastien Marie <semarie at openbsd.org>
  Approved by:	rust (dumbbell)
  MFH:		2017Q4 (required by Firefox 57 scheduled on 2017-11-14)

Added:
  head/lang/rust/files/patch-src_librustc__back_target_freebsd__base.rs   (contents, props changed)
Deleted:
  head/www/firefox/files/patch-bug1401093
Modified:
  head/lang/rust/Makefile   (contents, props changed)
  head/www/firefox/Makefile   (contents, props changed)

Modified: head/lang/rust/Makefile
==============================================================================
--- head/lang/rust/Makefile	Mon Oct 23 22:58:32 2017	(r452747)
+++ head/lang/rust/Makefile	Mon Oct 23 22:58:48 2017	(r452748)
@@ -3,6 +3,7 @@
 
 PORTNAME=	rust
 PORTVERSION?=	1.20.0
+PORTREVISION?=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://static.rust-lang.org/dist/:src \
 		https://static.rust-lang.org/dist/:rust_bootstrap \

Added: head/lang/rust/files/patch-src_librustc__back_target_freebsd__base.rs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/rust/files/patch-src_librustc__back_target_freebsd__base.rs	Mon Oct 23 22:58:48 2017	(r452748)
@@ -0,0 +1,12 @@
+Return struct like OpenBSD, see src/librustc_trans/cabi_x86.rs
+
+--- src/librustc_back/target/freebsd_base.rs.orig	2017-07-17 22:10:50 UTC
++++ src/librustc_back/target/freebsd_base.rs
+@@ -31,6 +31,7 @@ pub fn opts() -> TargetOptions {
+         target_family: Some("unix".to_string()),
+         linker_is_gnu: true,
+         has_rpath: true,
++        is_like_openbsd: true,
+         pre_link_args: args,
+         position_independent_executables: true,
+         exe_allocation_crate: super::maybe_jemalloc(),

Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile	Mon Oct 23 22:58:32 2017	(r452747)
+++ head/www/firefox/Makefile	Mon Oct 23 22:58:48 2017	(r452748)
@@ -4,7 +4,7 @@
 PORTNAME=	firefox
 DISTVERSION=	56.0.1
 DISTVERSIONSUFFIX=.source
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \