CVS commit: pkgsrc/www/firefox

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Jun  7 14:40:13 UTC 2023

Modified Files:
        pkgsrc/www/firefox: mozilla-common.mk

Log Message:
firefox: Try to fix build failure for older NetBSD

* Fix build when MAKE_JOBS is not defined under NetBSD 9.3 or earlier.


To generate a diff of this commit:
cvs rdiff -u -r1.254 -r1.255 pkgsrc/www/firefox/mozilla-common.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.254 pkgsrc/www/firefox/mozilla-common.mk:1.255
--- pkgsrc/www/firefox/mozilla-common.mk:1.254  Tue Jun  6 12:42:39 2023
+++ pkgsrc/www/firefox/mozilla-common.mk        Wed Jun  7 14:40:13 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.254 2023/06/06 12:42:39 riastradh Exp $
+# $NetBSD: mozilla-common.mk,v 1.255 2023/06/07 14:40:13 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -136,10 +136,12 @@ SUBST_FILES.fix-libpci-soname+=           ${MOZIL
 SUBST_SED.fix-libpci-soname+=          -e 's,"libpci.so, "lib${PCIUTILS_LIBNAME}.so,'
 
 # Do not pass '-j1 -j1' for MAKE_JOBS=1 for NetBSD 9.3 or rearlier.
-.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 090400
 RUST_MAKE_JOBS=                # empty by default
-.  if ${MAKE_JOBS} > 1
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 090400
+.  if defined(MAKE_JOBS) && !empty(MAKE_JOBS) && !(defined(MAKE_JOBS_SAFE) && ${MAKE_JOBS_SAFE:U:tl} == no)
+.    if ${MAKE_JOBS} > 1
 RUST_MAKE_JOBS=                -j1 # for MAKE_JOBS=1, RUST_MAKE_JOBS should be empty.
+.    endif
 .  endif
 .endif