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 (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,105 +1,107 @@ @@ -1,105 +1,107 @@
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
40BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections 42BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections
41 43
42SUBST_CLASSES+= dfly_malloc_h 44SUBST_CLASSES+= dfly_malloc_h
43SUBST_STAGE.dfly_malloc_h= pre-configure 45SUBST_STAGE.dfly_malloc_h= pre-configure
44SUBST_MESSAGE.dfly_malloc_h= Dont include malloc.h on dragonflybsd 46SUBST_MESSAGE.dfly_malloc_h= Dont include malloc.h on dragonflybsd
45SUBST_SED.dfly_malloc_h= -e 's,HAVE_MALLOC_H,HAVE_MALLOC_H \&\& !defined(__DragonFly__),g' 47SUBST_SED.dfly_malloc_h= -e 's,HAVE_MALLOC_H,HAVE_MALLOC_H \&\& !defined(__DragonFly__),g'
46SUBST_FILES.dfly_malloc_h= media/libav/libavutil/mem.c 48SUBST_FILES.dfly_malloc_h= media/libav/libavutil/mem.c
47SUBST_FILES.dfly_malloc_h+= media/ffvpx/libavutil/mem.c 49SUBST_FILES.dfly_malloc_h+= media/ffvpx/libavutil/mem.c
48 50
49LDFLAGS.DragonFly= -lplc4 -lnspr4 51LDFLAGS.DragonFly= -lplc4 -lnspr4
50LDFLAGS.FreeBSD= -lplc4 -lnspr4 52LDFLAGS.FreeBSD= -lplc4 -lnspr4
51LDFLAGS.Linux= -lnspr4 53LDFLAGS.Linux= -lnspr4
52 54
53.include "mozilla-common.mk" 55.include "mozilla-common.mk"
54.include "options.mk" 56.include "options.mk"
55 57
56CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py 58CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py
57CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py 59CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py
58CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py 60CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
59CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py 61CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
60 62
61CHECK_WRKREF_SKIP+=lib/firefox/chrome/toolkit/content/global/buildconfig.html 63CHECK_WRKREF_SKIP+=lib/firefox/chrome/toolkit/content/global/buildconfig.html
62 64
63MOZILLA=firefox 65MOZILLA=firefox
64MOZILLA_ICON= ${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png 66MOZILLA_ICON= ${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png
65.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) 67.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
66MOZILLA_NAME= Firefox 68MOZILLA_NAME= Firefox
67.else 69.else
68MOZILLA_NAME= Browser 70MOZILLA_NAME= Browser
69.endif 71.endif
70 72
71SUBST_CLASSES+= sys-dic 73SUBST_CLASSES+= sys-dic
72SUBST_STAGE.sys-dic= pre-configure 74SUBST_STAGE.sys-dic= pre-configure
73SUBST_MESSAGE.sys-dic= Reference to system hunspell dictionaries. 75SUBST_MESSAGE.sys-dic= Reference to system hunspell dictionaries.
74SUBST_FILES.sys-dic= extensions/spellcheck/hunspell/glue/mozHunspell.cpp 76SUBST_FILES.sys-dic= extensions/spellcheck/hunspell/glue/mozHunspell.cpp
75SUBST_VARS.sys-dic= PREFIX 77SUBST_VARS.sys-dic= PREFIX
76 78
77post-extract: 79post-extract:
78 mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S 80 mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S
79 81
80pre-configure: 82pre-configure:
81 cd ${WRKSRC} && autoconf 83 cd ${WRKSRC} && autoconf
82 cd ${WRKSRC}/js/src && autoconf 84 cd ${WRKSRC}/js/src && autoconf
83 cd ${WRKSRC} && mkdir ${OBJDIR} 85 cd ${WRKSRC} && mkdir ${OBJDIR}
84 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars 86 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars
85 87
86post-build: 88post-build:
87 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \ 89 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \
88 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \ 90 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \
89 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \ 91 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \
90 < ${FILESDIR}/desktop.in \ 92 < ${FILESDIR}/desktop.in \
91 > ${WRKDIR}/desktop 93 > ${WRKDIR}/desktop
92 94
93INSTALLATION_DIRS+= share/applications share/pixmaps 95INSTALLATION_DIRS+= share/applications share/pixmaps
94post-install: 96post-install:
95 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA} 97 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA}
96 ${ECHO} '${PREFIX}/lib/firefox/firefox "$$@"' >> \ 98 ${ECHO} '${PREFIX}/lib/firefox/firefox "$$@"' >> \
97 ${DESTDIR}${PREFIX}/bin/${MOZILLA} 99 ${DESTDIR}${PREFIX}/bin/${MOZILLA}
98 ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA} 100 ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA}
99 ${INSTALL_DATA} ${WRKDIR}/desktop \ 101 ${INSTALL_DATA} ${WRKDIR}/desktop \
100 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop 102 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
101 ${INSTALL_DATA} ${MOZILLA_ICON} \ 103 ${INSTALL_DATA} ${MOZILLA_ICON} \
102 ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png 104 ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
103 105
104.include "../../sysutils/desktop-file-utils/desktopdb.mk" 106.include "../../sysutils/desktop-file-utils/desktopdb.mk"
105.include "../../mk/bsd.pkg.mk" 107.include "../../mk/bsd.pkg.mk"