diff options
| author | wiz <wiz@pkgsrc.org> | 2020-08-22 23:12:51 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2020-08-22 23:12:51 +0000 |
| commit | 2d9ef43e804d4dfc98dc4e7358d64a200193f604 (patch) | |
| tree | dc56ba4c13ba3c3abede75cbcb38d6345f26d583 /mail | |
| parent | e4ecb5b6b777bd824541790525a17336188108ae (diff) | |
| download | pkgsrc-2d9ef43e804d4dfc98dc4e7358d64a200193f604.tar.gz | |
thunderbird: fix build with latest rust using patch from firefox68
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/thunderbird/distinfo | 3 | ||||
| -rw-r--r-- | mail/thunderbird/patches/patch-config_makefiles_rust.mk | 30 |
2 files changed, 32 insertions, 1 deletions
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index e6fccde0bce..22c4c73aceb 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -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.configure) = b57a9b1451dc426d75774f73d7c05f 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 diff --git a/mail/thunderbird/patches/patch-config_makefiles_rust.mk b/mail/thunderbird/patches/patch-config_makefiles_rust.mk new file mode 100644 index 00000000000..40f468a0cd0 --- /dev/null +++ b/mail/thunderbird/patches/patch-config_makefiles_rust.mk @@ -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)) |