Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Nov 2017 11:33:37 +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: r453451 - in head: Mk www/firefox
Message-ID:  <201711041133.vA4BXbP9017731@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Nov  4 11:33:37 2017
New Revision: 453451
URL: https://svnweb.freebsd.org/changeset/ports/453451

Log:
  www/firefox: move llvm* dep into Mk/bsd.gecko.mk
  
  MFH:		2017Q4

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

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Sat Nov  4 11:33:25 2017	(r453450)
+++ head/Mk/bsd.gecko.mk	Sat Nov  4 11:33:37 2017	(r453451)
@@ -105,6 +105,18 @@ USES+=		compiler:c++11-lang
 USE_XORG+=	xcb
 .endif
 
+.if ${MOZILLA_VER:R:R} >= 56
+BUILD_DEPENDS+=	llvm40>0:devel/llvm40
+MOZ_EXPORT+=	BINDGEN_CFLAGS="${BINDGEN_CFLAGS}"
+# XXX bug 1341234
+. if ! ${USE_MOZILLA:M-nspr}
+BINDGEN_CFLAGS+=-isystem${LOCALBASE}/include/nspr
+. endif
+. if ! ${USE_MOZILLA:M-pixman}
+BINDGEN_CFLAGS+=-isystem${LOCALBASE}/include/pixman-1
+. endif
+.endif
+
 .if ${OPSYS} == FreeBSD && ${OSREL} == 11.1
 LLD_UNSAFE=	yes
 .endif

Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile	Sat Nov  4 11:33:25 2017	(r453450)
+++ head/www/firefox/Makefile	Sat Nov  4 11:33:37 2017	(r453451)
@@ -27,7 +27,6 @@ BUILD_DEPENDS=	nspr>=4.16:devel/nspr \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf-2.13:devel/autoconf213 \
 		yasm:devel/yasm \
-		llvm40>0:devel/llvm40 \
 		zip:archivers/zip
 #		soundtouch>=1.9.0:audio/soundtouch \
 
@@ -44,8 +43,6 @@ USES=		tar:xz
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
-MOZ_EXPORT=	BINDGEN_CFLAGS="-isystem${LOCALBASE}/include/nspr \
-			-isystem${LOCALBASE}/include/pixman-1" # XXX bug 1341234
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding
 



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