Thu Jan 13 01:20:39 2022 UTC ()
firefox: address some items noted by pkglint


(gutteridge)
diff -r1.219 -r1.220 pkgsrc/www/firefox/mozilla-common.mk
cvs diff -r1.219 -r1.220 pkgsrc/www/firefox/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/mozilla-common.mk 2022/01/08 15:42:14 1.219
+++ pkgsrc/www/firefox/mozilla-common.mk 2022/01/13 01:20:39 1.220
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.219 2022/01/08 15:42:14 tnn Exp $ 1# $NetBSD: mozilla-common.mk,v 1.220 2022/01/13 01:20:39 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/firefox/Makefile 5# used by www/firefox/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/*/*.sh 71CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/*/*.sh
72CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh 72CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh
73CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure 73CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure
74CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh 74CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
75CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh 75CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
76#CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}modules/pdfium/update.sh 76#CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}modules/pdfium/update.sh
77 77
78CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3 78CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3
79CONFIGURE_ARGS+= --enable-release 79CONFIGURE_ARGS+= --enable-release
80# Disable Rust SIMD option to fix build with lang/rust-1.33.0 80# Disable Rust SIMD option to fix build with lang/rust-1.33.0
81# This should be enabled later again. 81# This should be enabled later again.
@@ -141,27 +141,27 @@ CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}b @@ -141,27 +141,27 @@ CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}b
141CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess 141CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess
142CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess 142CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess
143CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.guess 143CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.guess
144CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.sub 144CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.sub
145CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub 145CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub
146CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub 146CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub
147CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub 147CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub
148 148
149CONFIGURE_ENV+= CPP=${CPP:Q} 149CONFIGURE_ENV+= CPP=${CPP:Q}
150ALL_ENV+= SHELL=${CONFIG_SHELL:Q} 150ALL_ENV+= SHELL=${CONFIG_SHELL:Q}
151 151
152# Build outside ${WRKSRC} 152# Build outside ${WRKSRC}
153# Try to avoid conflict with config/makefiles/xpidl/Makefile.in 153# Try to avoid conflict with config/makefiles/xpidl/Makefile.in
154.if ${MAINTAINER_INTERNAL:Uno} == "yes 154.if ${MAINTAINER_INTERNAL:Uno} == "yes"
155OBJDIR= ../no-node-build 155OBJDIR= ../no-node-build
156.else 156.else
157OBJDIR= ../build 157OBJDIR= ../build
158.endif 158.endif
159CONFIGURE_DIRS= ${OBJDIR} 159CONFIGURE_DIRS= ${OBJDIR}
160CONFIGURE_SCRIPT= ${WRKSRC}/configure 160CONFIGURE_SCRIPT= ${WRKSRC}/configure
161 161
162PLIST_VARS+= ffvpx 162PLIST_VARS+= ffvpx
163 163
164.if ${MACHINE_ARCH} == "aarch64" || \ 164.if ${MACHINE_ARCH} == "aarch64" || \
165 !empty(MACHINE_ARCH:M*arm*) || \ 165 !empty(MACHINE_ARCH:M*arm*) || \
166 ${MACHINE_ARCH} == "i386" || \ 166 ${MACHINE_ARCH} == "i386" || \
167 ${MACHINE_ARCH} == "x86_64" 167 ${MACHINE_ARCH} == "x86_64"