Mon Nov 16 20:21:30 2020 UTC ()
firefox78: Needs py-expat to build (sometimes?)

Reported by Riastradh


(nia)
diff -r1.5 -r1.6 pkgsrc/www/firefox78/mozilla-common.mk
cvs diff -r1.5 -r1.6 pkgsrc/www/firefox78/Attic/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox78/Attic/mozilla-common.mk 2020/11/12 10:03:24 1.5
+++ pkgsrc/www/firefox78/Attic/mozilla-common.mk 2020/11/16 20:21:29 1.6
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: mozilla-common.mk,v 1.5 2020/11/12 10:03:24 nia Exp $ 1# $NetBSD: mozilla-common.mk,v 1.6 2020/11/16 20:21:29 nia 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}
15USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip 15USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip
16UNLIMIT_RESOURCES+= datasize virtualsize 16UNLIMIT_RESOURCES+= datasize virtualsize
17 17
18USE_LANGUAGES+= c c++ 18USE_LANGUAGES+= c c++
19 19
20TOOL_DEPENDS+= cbindgen>=0.14.2:../../devel/cbindgen 20TOOL_DEPENDS+= cbindgen>=0.14.2:../../devel/cbindgen
21.if ${MACHINE_ARCH} == "sparc64" 21.if ${MACHINE_ARCH} == "sparc64"
22CONFIGURE_ARGS+= --disable-nodejs 22CONFIGURE_ARGS+= --disable-nodejs
23.else 23.else
24TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs 24TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
25.endif 25.endif
26 26
27TOOL_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 27TOOL_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 28TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
28 29
29.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 30.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
30TOOL_DEPENDS+= nasm>=2.14:../../devel/nasm 31TOOL_DEPENDS+= nasm>=2.14:../../devel/nasm
31TOOL_DEPENDS+= yasm>=1.1:../../devel/yasm 32TOOL_DEPENDS+= yasm>=1.1:../../devel/yasm
32.endif 33.endif
33 34
34# For rustc/cargo detection 35# For rustc/cargo detection
35CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM} 36CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM}
36CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} 37CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM}
37 38
38CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \ 39CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \
39 -isystem${X11BASE}/include/pixman-1" 40 -isystem${X11BASE}/include/pixman-1"
40 41