CVS commit: pkgsrc/mail/thunderbird

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Aug 22 23:12:51 UTC 2020

Modified Files:
        pkgsrc/mail/thunderbird: distinfo
Added Files:
        pkgsrc/mail/thunderbird/patches: patch-config_makefiles_rust.mk

Log Message:
thunderbird: fix build with latest rust using patch from firefox68


To generate a diff of this commit:
cvs rdiff -u -r1.231 -r1.232 pkgsrc/mail/thunderbird/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/thunderbird/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/mail/thunderbird/distinfo
diff -u pkgsrc/mail/thunderbird/distinfo:1.231 pkgsrc/mail/thunderbird/distinfo:1.232
--- pkgsrc/mail/thunderbird/distinfo:1.231      Sat Jul  4 05:11:25 2020
+++ pkgsrc/mail/thunderbird/distinfo    Sat Aug 22 23:12:51 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.231 2020/07/04 05:11:25 ryoon Exp $
+$NetBSD: distinfo,v 1.232 2020/08/22 23:12:51 wiz Exp $
 
 SHA1 (thunderbird-68.10.0.source.tar.xz) = a71d9bbd9d587e521b5a7b0ff4b4d13c79bdb4cf
 RMD160 (thunderbird-68.10.0.source.tar.xz) = 01e0e995fbf43c05219594eb871461ca44fefe35
@@ -10,6 +10,7 @@ SHA1 (patch-build_moz.configure_rust.con
 SHA1 (patch-comm_mail_installer_package-manifest.in) = 14e8977f690e579a8caf73326248323615e04803
 SHA1 (patch-comm_mail_installer_removed-files.in) = f360ccac70a7afaee65e4617c015535084eee035
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = aa9664c1ba850e7c45b654dcf5d7d591d4994a86
+SHA1 (patch-config_makefiles_rust.mk) = 25502bfbe32877b35c244c2c19d6ee1dd63cb771
 SHA1 (patch-dom_base_nsAttrName.h) = 57a1a15cde53a1c8e22b1b38efdd40b9c0f1f91b
 SHA1 (patch-dom_media_CubebUtils.cpp) = 5022ead470ba2b3b75bc423e320be0cc18279b6b
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = 795b510b525019f49169d1a594cd3e455e706500

Added files:

Index: pkgsrc/mail/thunderbird/patches/patch-config_makefiles_rust.mk
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-config_makefiles_rust.mk:1.1
--- /dev/null   Sat Aug 22 23:12:51 2020
+++ pkgsrc/mail/thunderbird/patches/patch-config_makefiles_rust.mk      Sat Aug 22 23:12:51 2020
@@ -0,0 +1,30 @@
+$NetBSD: patch-config_makefiles_rust.mk,v 1.1 2020/08/22 23:12:51 wiz 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))