From owner-svn-ports-head@freebsd.org Sat Nov 4 11:33:38 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9994CE6BED4; Sat, 4 Nov 2017 11:33:38 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 654366A969; Sat, 4 Nov 2017 11:33:38 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA4BXbhU017733; Sat, 4 Nov 2017 11:33:37 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4BXbP9017731; Sat, 4 Nov 2017 11:33:37 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201711041133.vA4BXbP9017731@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 4 Nov 2017 11:33:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453451 - in head: Mk www/firefox X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head: Mk www/firefox X-SVN-Commit-Revision: 453451 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Nov 2017 11:33:38 -0000 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