Thu Dec 10 19:54:33 2020 UTC ()
Pullup ticket #6369 - requested by riastradh
www/firefox78: build fix

(via patch)

Add build dependency to expat Python module.


(bsiegert)
diff -r1.1 -r1.1.2.1 pkgsrc/www/firefox78/mozilla-common.mk
cvs diff -r1.1 -r1.1.2.1 pkgsrc/www/firefox78/Attic/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox78/Attic/mozilla-common.mk 2020/07/30 08:09:28 1.1
+++ pkgsrc/www/firefox78/Attic/mozilla-common.mk 2020/12/10 19:54:33 1.1.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.1 2020/07/30 08:09:28 nia Exp $ 1# $NetBSD: mozilla-common.mk,v 1.1.2.1 2020/12/10 19:54:33 bsiegert 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
9# Python 2.7 and Python 3.6 or later are required simultaneously. 9# Python 2.7 and Python 3.6 or later are required simultaneously.
10PYTHON_VERSIONS_ACCEPTED= 27 10PYTHON_VERSIONS_ACCEPTED= 27
11PYTHON_FOR_BUILD_ONLY= tool 11PYTHON_FOR_BUILD_ONLY= tool
12.if !empty(PYTHON_VERSION_DEFAULT:M3[6789]) 12.if !empty(PYTHON_VERSION_DEFAULT:M3[6789])
13TOOL_DEPENDS+= python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT} 13TOOL_DEPENDS+= python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
14ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./} 14ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./}
@@ -37,28 +37,30 @@ UNLIMIT_RESOURCES+= datasize virtualsize @@ -37,28 +37,30 @@ UNLIMIT_RESOURCES+= datasize virtualsize
37# selection framework. 37# selection framework.
38USE_LANGUAGES+= c99 c++ 38USE_LANGUAGES+= c99 c++
39 39
40TOOL_DEPENDS+= cbindgen>=0.14.2:../../devel/cbindgen 40TOOL_DEPENDS+= cbindgen>=0.14.2:../../devel/cbindgen
41.if ${MACHINE_ARCH} == "sparc64" 41.if ${MACHINE_ARCH} == "sparc64"
42CONFIGURE_ARGS+= --disable-nodejs 42CONFIGURE_ARGS+= --disable-nodejs
43.else 43.else
44TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs 44TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
45.endif 45.endif
46 46
47# Depend on Python3 sqlite3 module. 47# Depend on Python3 sqlite3 module.
48.if !empty(PYTHON_VERSION_DEFAULT:M3[6789]) 48.if !empty(PYTHON_VERSION_DEFAULT:M3[6789])
49BUILD_DEPENDS+= py${PYTHON_VERSION_DEFAULT}-sqlite3-[0-9]*:../../databases/py-sqlite3 49BUILD_DEPENDS+= py${PYTHON_VERSION_DEFAULT}-sqlite3-[0-9]*:../../databases/py-sqlite3
 50BUILD_DEPENDS+= py${PYTHON_VERSION_DEFAULT}-expat-[0-9]*:../../textproc/py-expat
50.else 51.else
51BUILD_DEPENDS+= py37-sqlite3-[0-9]*:../../databases/py-sqlite3 52BUILD_DEPENDS+= py37-sqlite3-[0-9]*:../../databases/py-sqlite3
 53BUILD_DEPENDS+= py37-expat-[0-9]*:../../textproc/py-expat
52.endif 54.endif
53.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 55.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
54TOOL_DEPENDS+= nasm>=2.14:../../devel/nasm 56TOOL_DEPENDS+= nasm>=2.14:../../devel/nasm
55TOOL_DEPENDS+= yasm>=1.1:../../devel/yasm 57TOOL_DEPENDS+= yasm>=1.1:../../devel/yasm
56.endif 58.endif
57 59
58# For rustc/cargo detection 60# For rustc/cargo detection
59CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM} 61CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM}
60CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} 62CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM}
61 63
62CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \ 64CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \
63 -isystem${X11BASE}/include/pixman-1" 65 -isystem${X11BASE}/include/pixman-1"
64 66