Wed Apr 21 22:21:09 2021 UTC ()
firefox: restore (updated) BUILDLINK_API_DEPENDS local override

It's not safe to assume a dependency's BUILDLINK_ABI_DEPENDS value can
double for the API minimum, as the former can be disabled by users.
Noted by wiz@, thanks!


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

--- pkgsrc/www/firefox/mozilla-common.mk 2021/04/21 01:27:52 1.200
+++ pkgsrc/www/firefox/mozilla-common.mk 2021/04/21 22:21:08 1.201
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.200 2021/04/21 01:27:52 gutteridge Exp $ 1# $NetBSD: mozilla-common.mk,v 1.201 2021/04/21 22:21:08 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}
@@ -155,26 +155,27 @@ fix-clang-wrapper: @@ -155,26 +155,27 @@ fix-clang-wrapper:
155# The configure test for __thread succeeds, but later we end up with: 155# The configure test for __thread succeeds, but later we end up with:
156# dist/bin/libxul.so: undefined reference to `__tls_get_addr' 156# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
157CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no 157CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no
158# In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails. 158# In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails.
159CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic= 159CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic=
160 160
161.include "../../mk/atomic64.mk" 161.include "../../mk/atomic64.mk"
162BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 162BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
163.include "../../devel/libevent/buildlink3.mk" 163.include "../../devel/libevent/buildlink3.mk"
164.include "../../devel/libffi/buildlink3.mk" 164.include "../../devel/libffi/buildlink3.mk"
165BUILDLINK_API_DEPENDS.nspr+= nspr>=4.26 165BUILDLINK_API_DEPENDS.nspr+= nspr>=4.26
166.include "../../devel/nspr/buildlink3.mk" 166.include "../../devel/nspr/buildlink3.mk"
167.include "../../textproc/icu/buildlink3.mk" 167.include "../../textproc/icu/buildlink3.mk"
 168BUILDLINK_API_DEPENDS.nss+= nss>=3.63
168.include "../../devel/nss/buildlink3.mk" 169.include "../../devel/nss/buildlink3.mk"
169.include "../../devel/zlib/buildlink3.mk" 170.include "../../devel/zlib/buildlink3.mk"
170#.include "../../mk/jpeg.buildlink3.mk" 171#.include "../../mk/jpeg.buildlink3.mk"
171.include "../../graphics/MesaLib/buildlink3.mk" 172.include "../../graphics/MesaLib/buildlink3.mk"
172#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 173#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
173#.include "../../graphics/cairo/buildlink3.mk" 174#.include "../../graphics/cairo/buildlink3.mk"
174BUILDLINK_API_DEPENDS.libwebp+= libwebp>=1.0.2 175BUILDLINK_API_DEPENDS.libwebp+= libwebp>=1.0.2
175.include "../../graphics/libwebp/buildlink3.mk" 176.include "../../graphics/libwebp/buildlink3.mk"
176BUILDLINK_DEPMETHOD.clang= build 177BUILDLINK_DEPMETHOD.clang= build
177.include "../../lang/clang/buildlink3.mk" 178.include "../../lang/clang/buildlink3.mk"
178.if !empty(MACHINE_PLATFORM:MNetBSD-8.*-*) 179.if !empty(MACHINE_PLATFORM:MNetBSD-8.*-*)
179BUILDLINK_DEPMETHOD.gcc8= full 180BUILDLINK_DEPMETHOD.gcc8= full
180.include "../../lang/gcc8/buildlink3.mk" 181.include "../../lang/gcc8/buildlink3.mk"