diff options
author | pgoyette <pgoyette@pkgsrc.org> | 2020-09-05 02:49:27 +0000 |
---|---|---|
committer | pgoyette <pgoyette@pkgsrc.org> | 2020-09-05 02:49:27 +0000 |
commit | a9cf2f2c3f20cf8d3b56f94c7bb87342d23ed3de (patch) | |
tree | d496f85ae98fd88cd0626d1916fc2fb7c268dd76 /mail/thunderbird68/patches | |
parent | ec9d26ea398f6bdacd24870b62c7644251d40369 (diff) | |
download | pkgsrc-a9cf2f2c3f20cf8d3b56f94c7bb87342d23ed3de.tar.gz |
Remove a .orig file that was mistakenly committed. OK ryoon@
Diffstat (limited to 'mail/thunderbird68/patches')
-rw-r--r-- | mail/thunderbird68/patches/patch-config_makefiles_rust.mk.orig | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/mail/thunderbird68/patches/patch-config_makefiles_rust.mk.orig b/mail/thunderbird68/patches/patch-config_makefiles_rust.mk.orig deleted file mode 100644 index 46d078242a3..00000000000 --- a/mail/thunderbird68/patches/patch-config_makefiles_rust.mk.orig +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-config_makefiles_rust.mk.orig,v 1.1 2020/09/03 20:22:26 ryoon 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)) |