Fri Jul 6 20:51:24 2018 UTC ()
Fix build under NetBSD/{i386,amd64} 8.0_RC2 with lang/gcc6


(ryoon)
diff -r1.335 -r1.336 pkgsrc/www/firefox/Makefile
cvs diff -r1.335 -r1.336 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2018/07/06 15:06:50 1.335
+++ pkgsrc/www/firefox/Makefile 2018/07/06 20:51:24 1.336
@@ -1,39 +1,41 @@ @@ -1,39 +1,41 @@
1# $NetBSD: Makefile,v 1.335 2018/07/06 15:06:50 ryoon Exp $ 1# $NetBSD: Makefile,v 1.336 2018/07/06 20:51:24 ryoon Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 61.0 4MOZ_BRANCH= 61.0
5MOZ_BRANCH_MINOR=  5MOZ_BRANCH_MINOR=
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//} 8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
9PKGREVISION= 1 9PKGREVISION= 1
10CATEGORIES= www 10CATEGORIES= www
11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
12EXTRACT_SUFX= .tar.xz 12EXTRACT_SUFX= .tar.xz
13 13
14MAINTAINER= ryoon@NetBSD.org 14MAINTAINER= ryoon@NetBSD.org
15HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 15HOMEPAGE= http://www.mozilla.com/en-US/firefox/
16COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:C/\..*//}) 16COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:C/\..*//})
17LICENSE= mpl-1.1 17LICENSE= mpl-1.1
18 18
19WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER} 19WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER}
20 20
21MOZILLA_DIR= # empty 21MOZILLA_DIR= # empty
22 22
23# Note: when updating remember to conditionalise about-background.png in PLIST 23# Note: when updating remember to conditionalise about-background.png in PLIST
24CONFIGURE_ARGS+= --enable-application=browser 24CONFIGURE_ARGS+= --enable-application=browser
25 25
26CFLAGS+= -I${PREFIX}/include/nspr 26CFLAGS+= -I${PREFIX}/include/nspr
 27# for lang/gcc6
 28CFLAGS+= -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS
27 29
28# workround for link of libxul.so etc. 30# workround for link of libxul.so etc.
29LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/firefox ${COMPILER_RPATH_FLAG}${PREFIX}/lib 31LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/firefox ${COMPILER_RPATH_FLAG}${PREFIX}/lib
30LDFLAGS.SunOS+= -lm 32LDFLAGS.SunOS+= -lm
31 33
32NOT_PAX_MPROTECT_SAFE+= lib/firefox/firefox 34NOT_PAX_MPROTECT_SAFE+= lib/firefox/firefox
33NOT_PAX_MPROTECT_SAFE+= lib/firefox/firefox-bin 35NOT_PAX_MPROTECT_SAFE+= lib/firefox/firefox-bin
34NOT_PAX_MPROTECT_SAFE+= lib/firefox/plugin-container 36NOT_PAX_MPROTECT_SAFE+= lib/firefox/plugin-container
35 37
36ALL_ENV+= MOZILLA_PKG_NAME=firefox 38ALL_ENV+= MOZILLA_PKG_NAME=firefox
37 39
38# Avoid ld "invalid section index" errors. 40# Avoid ld "invalid section index" errors.
39BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections 41BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections