Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Mar 2016 15:35:39 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r411854 - in head: Mk www/firefox
Message-ID:  <201603251535.u2PFZd93092525@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Mar 25 15:35:39 2016
New Revision: 411854
URL: https://svnweb.freebsd.org/changeset/ports/411854

Log:
  www/firefox: build with Rust sources
  
  Only MP4 metadata parser have landed converted so far. Upstream enabled it
  in their binaries since 45.0 while preparing to *require* Rust downstream.
  
  https://wiki.mozilla.org/Oxidation
  https://www.mail-archive.com/dev-platform%40lists.mozilla.org/msg17614.html

Modified:
  head/Mk/bsd.gecko.mk   (contents, props changed)
  head/www/firefox/Makefile   (contents, props changed)
  head/www/firefox/Makefile.options   (contents, props changed)

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Fri Mar 25 15:32:43 2016	(r411853)
+++ head/Mk/bsd.gecko.mk	Fri Mar 25 15:35:39 2016	(r411854)
@@ -395,6 +395,16 @@ MOZ_OPTIONS+=	--enable-pulseaudio
 MOZ_OPTIONS+=	--disable-pulseaudio
 .endif
 
+.if ${MOZILLA_VER:R:R} >= 40
+.if ${PORT_OPTIONS:MRUST}
+BUILD_DEPENDS+=	rustc:${PORTSDIR}/${RUST_PORT}
+RUST_PORT?=		lang/rust
+MOZ_OPTIONS+=	--enable-rust
+.else
+MOZ_OPTIONS+=	--disable-rust
+.endif
+.endif
+
 .if ${PORT_OPTIONS:MDEBUG}
 MOZ_OPTIONS+=	--enable-debug --disable-release
 STRIP=	# ports/184285

Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile	Fri Mar 25 15:32:43 2016	(r411853)
+++ head/www/firefox/Makefile	Fri Mar 25 15:35:39 2016	(r411854)
@@ -4,7 +4,7 @@
 PORTNAME=	firefox
 DISTVERSION=	45.0.1
 DISTVERSIONSUFFIX=.source
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
@@ -50,7 +50,14 @@ MOZ_OPTIONS=	--program-transform-name='s
 		--enable-official-branding
 
 OPTIONS_EXCLUDE=	GSTREAMER LOGGING
-OPTIONS_DEFAULT=	BUNDLED_CAIRO GTK3
+OPTIONS_DEFINE=		RUST
+OPTIONS_DEFAULT=	BUNDLED_CAIRO GTK3 ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}_${ARCH}}
+
+# XXX lang/rust currently builds only on these platforms
+OPTIONS_DEFAULT_FreeBSD_10_amd64=	RUST
+OPTIONS_DEFAULT_FreeBSD_10_i386=	RUST
+OPTIONS_DEFAULT_FreeBSD_11_amd64=	RUST
+OPTIONS_DEFAULT_FreeBSD_11_i386=	RUST
 
 OPTIONS_SINGLE+=	TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3

Modified: head/www/firefox/Makefile.options
==============================================================================
--- head/www/firefox/Makefile.options	Fri Mar 25 15:32:43 2016	(r411853)
+++ head/www/firefox/Makefile.options	Fri Mar 25 15:35:39 2016	(r411854)
@@ -28,3 +28,4 @@ INTEGER_SAMPLES_DESC?=	Integer audio sam
 LIBPROXY_DESC?=		Proxy support via libproxy
 LIGHTNING_DESC?=	Calendar extension
 LOGGING_DESC?=		Additional log messages
+RUST_DESC?=		Build with components written in Rust language



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603251535.u2PFZd93092525>