CVS commit: pkgsrc/www/firefox68

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Fri Aug  7 09:09:48 UTC 2020

Modified Files:
        pkgsrc/www/firefox68: distinfo
Added Files:
        pkgsrc/www/firefox68/patches: patch-config_makefiles_rust.mk

Log Message:
firefox68: pick up patch-config_makefiles_rust.mk from firefox package.

This fixes the build with newer Rust, but probably also helps netbsd
releases which had the "dead lock detected" flakiness.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/firefox68/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox68/patches/patch-config_makefiles_rust.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/firefox68/distinfo
diff -u pkgsrc/www/firefox68/distinfo:1.21 pkgsrc/www/firefox68/distinfo:1.22
--- pkgsrc/www/firefox68/distinfo:1.21  Wed Jul 29 14:20:30 2020
+++ pkgsrc/www/firefox68/distinfo       Fri Aug  7 09:09:48 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2020/07/29 14:20:30 nia Exp $
+$NetBSD: distinfo,v 1.22 2020/08/07 09:09:48 maya Exp $
 
 SHA1 (firefox-68.11.0esr.source.tar.xz) = 445acbf7b7b8f75374ee6347bb6f45748511bcf9
 RMD160 (firefox-68.11.0esr.source.tar.xz) = 82edab46fe312a47889047fe431784c511684ade
@@ -8,6 +8,7 @@ SHA1 (patch-aa) = 9f7200c411cd2217a80ec1
 SHA1 (patch-browser_app_profile_firefox.js) = cf93582b68b8d4e72c3c25682ab9138e185418c8
 SHA1 (patch-build_moz.configure_rust.configure) = b57a9b1451dc426d75774f73d7c05fc98fe6e317
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = 11b45e0c7a9399c5b74b170648280a388dd67d89
+SHA1 (patch-config_makefiles_rust.mk) = 25502bfbe32877b35c244c2c19d6ee1dd63cb771
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
 SHA1 (patch-dom_media_CubebUtils.cpp) = 3cd2c65ab281d802c56216565970450767a3fb24
 SHA1 (patch-dom_webauthn_u2f-hid-rs_src_lib.rs) = c0dfe8b1e7ebbc7c1d6066c204030f13b063b8d7

Added files:

Index: pkgsrc/www/firefox68/patches/patch-config_makefiles_rust.mk
diff -u /dev/null pkgsrc/www/firefox68/patches/patch-config_makefiles_rust.mk:1.1
--- /dev/null   Fri Aug  7 09:09:48 2020
+++ pkgsrc/www/firefox68/patches/patch-config_makefiles_rust.mk Fri Aug  7 09:09:48 2020
@@ -0,0 +1,30 @@
+$NetBSD: patch-config_makefiles_rust.mk,v 1.1 2020/08/07 09:09:48 maya Exp $
+
+NetBSD<10 doesn't get along with parallel rust builds (it causes issues
+with ld.so) which are the default. Force -j1.
+
+Set -Cembed-bitcode=yes when using LTO to fix build with rust >= 1.45.
+Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
+
+--- config/makefiles/rust.mk.orig      2020-07-20 21:02:39.000000000 +0000
++++ config/makefiles/rust.mk
+@@ -49,11 +49,19 @@ ifndef MOZ_DEBUG_RUST
+ # Enable link-time optimization for release builds.
+ cargo_rustc_flags += -C lto
+ endif
++# Versions of rust >= 1.45 need -Cembed-bitcode=yes for all crates when
++# using -Clto.
++ifeq (,$(filter 1.38.% 1.39.% 1.40.% 1.41.% 1.42.% 1.43.% 1.44.%,$(RUSTC_VERSION)))
++RUSTFLAGS += -Cembed-bitcode=yes
++endif
+ endif
+ 
+ ifdef CARGO_INCREMENTAL
+ export CARGO_INCREMENTAL
+ endif
++ifeq ($(OS_ARCH),NetBSD)
++cargo_build_flags += -j1
++endif
+ 
+ rustflags_neon =
+ ifeq (neon,$(MOZ_FPU))