[pkgsrc/trunk]: pkgsrc/www/firefox firefox: help netbsd unattended builds by ...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3317526116de
branches:  trunk
changeset: 430411:3317526116de
user:      maya <maya%pkgsrc.org@localhost>
date:      Thu Apr 30 19:08:50 2020 +0000

description:
firefox: help netbsd unattended builds by running cargo with -j1

it defaults to -j(NUMBER OF CPUS) and this triggers an ld.so vs. fork
issue.

diffstat:

 www/firefox/distinfo                               |   3 ++-
 www/firefox/patches/patch-config_makefiles_rust.mk |  17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r 7ae6cc937237 -r 3317526116de www/firefox/distinfo
--- a/www/firefox/distinfo      Thu Apr 30 18:52:33 2020 +0000
+++ b/www/firefox/distinfo      Thu Apr 30 19:08:50 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.388 2020/04/09 14:01:26 ryoon Exp $
+$NetBSD: distinfo,v 1.389 2020/04/30 19:08:50 maya Exp $
 
 SHA1 (firefox-75.0.source.tar.xz) = df7904c16d525eb791728d655258b7d1fe064db9
 RMD160 (firefox-75.0.source.tar.xz) = e75ffcf93adab1198a93b42a6d2f8722be3745ce
@@ -9,6 +9,7 @@
 SHA1 (patch-browser_components_BrowserGlue.jsm) = dcbf01db8b06db3376f0545ccfbba9dde5790c82
 SHA1 (patch-build_moz.configure_rust.configure) = ee9e207e67709f3c9455b4d22f5f254890e99ca8
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = 781a063fa6ab345face53fd88404ead11ab335b2
+SHA1 (patch-config_makefiles_rust.mk) = 8637cd3f56774648fd586c7ad8dd49e269b9eb2a
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
 SHA1 (patch-dom_media_CubebUtils.cpp) = 226821d961039ae5c9c50d8615757b73c6bcd80a
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
diff -r 7ae6cc937237 -r 3317526116de www/firefox/patches/patch-config_makefiles_rust.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-config_makefiles_rust.mk        Thu Apr 30 19:08:50 2020 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-config_makefiles_rust.mk,v 1.1 2020/04/30 19:08:50 maya Exp $
+
+NetBSD doesn't get along with parallel rust builds (it causes issues
+with ld.so) which are the default. Force -j1.
+
+--- config/makefiles/rust.mk.orig      2020-04-03 19:34:34.000000000 +0000
++++ config/makefiles/rust.mk
+@@ -52,6 +52,9 @@ endif
+ ifeq (1,$(MOZ_PARALLEL_BUILD))
+ cargo_build_flags += -j1
+ endif
++ifeq ($(OS_ARCH),NetBSD)
++cargo_build_flags += -j1
++endif
+ 
+ # These flags are passed via `cargo rustc` and only apply to the final rustc
+ # invocation (i.e., only the top-level crate, not its dependencies).