Thu Jan 13 01:25:23 2022 UTC ()
firefox91: address some items noted by pkglint


(gutteridge)
diff -r1.4 -r1.5 pkgsrc/www/firefox91/mozilla-common.mk
cvs diff -r1.4 -r1.5 pkgsrc/www/firefox91/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox91/mozilla-common.mk 2022/01/07 15:06:21 1.4
+++ pkgsrc/www/firefox91/mozilla-common.mk 2022/01/13 01:25:23 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.4 2022/01/07 15:06:21 tnn Exp $ 1# $NetBSD: mozilla-common.mk,v 1.5 2022/01/13 01:25:23 gutteridge Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox91/Makefile 5# used by www/firefox91/Makefile
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9PYTHON_VERSIONS_INCOMPATIBLE= 27 9PYTHON_VERSIONS_INCOMPATIBLE= 27
10PYTHON_FOR_BUILD_ONLY= tool 10PYTHON_FOR_BUILD_ONLY= tool
11ALL_ENV+= PYTHON3=${PYTHONBIN} 11ALL_ENV+= PYTHON3=${PYTHONBIN}
12 12
13HAS_CONFIGURE= yes 13HAS_CONFIGURE= yes
14CONFIGURE_ARGS+= --prefix=${PREFIX} 14CONFIGURE_ARGS+= --prefix=${PREFIX}
@@ -49,33 +49,33 @@ CONFIGURE_ARGS+= --host=${MACHINE_GNU_PL @@ -49,33 +49,33 @@ CONFIGURE_ARGS+= --host=${MACHINE_GNU_PL
49.endif 49.endif
50 50
51CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \ 51CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \
52 -isystem${X11BASE}/include/pixman-1" 52 -isystem${X11BASE}/include/pixman-1"
53 53
54test: 54test:
55 cd ${WRKSRC}/${OBJDIR}/dist/bin && \ 55 cd ${WRKSRC}/${OBJDIR}/dist/bin && \
56 ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey 56 ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey
57 57
58# tar(1) of OpenBSD 5.5 has no --exclude command line option. 58# tar(1) of OpenBSD 5.5 has no --exclude command line option.
59.if ${OPSYS} == "OpenBSD" 59.if ${OPSYS} == "OpenBSD"
60TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar} 60TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar}
61USE_TOOLS+= bsdtar 61USE_TOOLS+= bsdtar
 62.else
 63USE_TOOLS+= tar
62.endif 64.endif
63 65
64PLIST_VARS+= i386 
65.if ${MACHINE_ARCH} == "i386" 66.if ${MACHINE_ARCH} == "i386"
66# This is required for SSE2 code under i386. 67# This is required for SSE2 code under i386.
67CXXFLAGS+= -mstackrealign 68CXXFLAGS+= -mstackrealign
68PLIST.i386= yes 
69.endif 69.endif
70 70
71CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 71CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
72CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 72CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
73CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh 73CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh
74CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure 74CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure
75CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh 75CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
76CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh 76CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
77#CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}modules/pdfium/update.sh 77#CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}modules/pdfium/update.sh
78 78
79CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3 79CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3
80CONFIGURE_ARGS+= --enable-release 80CONFIGURE_ARGS+= --enable-release
81# Disable Rust SIMD option to fix build with lang/rust-1.33.0 81# Disable Rust SIMD option to fix build with lang/rust-1.33.0
@@ -129,27 +129,27 @@ CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}b @@ -129,27 +129,27 @@ CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}b
129CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess 129CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess
130CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess 130CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess
131CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.guess 131CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.guess
132CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.sub 132CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.sub
133CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub 133CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub
134CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub 134CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub
135CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub 135CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub
136 136
137CONFIGURE_ENV+= CPP=${CPP:Q} 137CONFIGURE_ENV+= CPP=${CPP:Q}
138ALL_ENV+= SHELL=${CONFIG_SHELL:Q} 138ALL_ENV+= SHELL=${CONFIG_SHELL:Q}
139 139
140# Build outside ${WRKSRC} 140# Build outside ${WRKSRC}
141# Try to avoid conflict with config/makefiles/xpidl/Makefile.in 141# Try to avoid conflict with config/makefiles/xpidl/Makefile.in
142.if ${MAINTAINER_INTERNAL:Uno} == "yes 142.if ${MAINTAINER_INTERNAL:Uno} == "yes"
143OBJDIR= ../no-node-build 143OBJDIR= ../no-node-build
144.else 144.else
145OBJDIR= ../build 145OBJDIR= ../build
146.endif 146.endif
147CONFIGURE_DIRS= ${OBJDIR} 147CONFIGURE_DIRS= ${OBJDIR}
148CONFIGURE_SCRIPT= ${WRKSRC}/configure 148CONFIGURE_SCRIPT= ${WRKSRC}/configure
149 149
150PLIST_VARS+= ffvpx 150PLIST_VARS+= ffvpx
151 151
152.if ${MACHINE_ARCH} == "aarch64" || \ 152.if ${MACHINE_ARCH} == "aarch64" || \
153 !empty(MACHINE_ARCH:M*arm*) || \ 153 !empty(MACHINE_ARCH:M*arm*) || \
154 ${MACHINE_ARCH} == "i386" || \ 154 ${MACHINE_ARCH} == "i386" || \
155 ${MACHINE_ARCH} == "x86_64" 155 ${MACHINE_ARCH} == "x86_64"