rust: Reintroduce -Copt-level=2 to RUSTFLAGS.

[Havard Eidnes <he%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Sun Jan 16 09:33:07 2022 +0000
Changeset:	ca7d8de1e289b5d9743f7a86d4a4febe73c15106

Modified Files:
	rust/distinfo
	rust/patches/patch-compiler_rustc__llvm_build.rs
	rust/patches/patch-src_bootstrap_bootstrap.py

Log Message:
rust: Reintroduce -Copt-level=2 to RUSTFLAGS.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ca7d8de1e289b5d9743f7a86d4a4febe73c15106

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rust/distinfo                                    | 2 +-
 rust/patches/patch-compiler_rustc__llvm_build.rs | 2 +-
 rust/patches/patch-src_bootstrap_bootstrap.py    | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diffs:
diff --git a/rust/distinfo b/rust/distinfo
index 4c93b8daf7..dc7e41450a 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -111,7 +111,7 @@ SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = 18e3cb9f32c417067
 SHA1 (patch-library_std_src_sys_unix_mod.rs) = f8669d680f169137ac2891af2977909619366a97
 SHA1 (patch-library_std_src_sys_unix_thread.rs) = e5f661b3dd00058e874fe60cd89d9e919325e99b
 SHA1 (patch-library_unwind_build.rs) = df092d5c07fa0be63a9510f1d6a77e5094ca3b15
-SHA1 (patch-src_bootstrap_bootstrap.py) = 9ffb0d83bafd1bed78e357d832bae79b24589c7c
+SHA1 (patch-src_bootstrap_bootstrap.py) = 54a631b0a25ceb04469e7be60298a031ae6916d6
 SHA1 (patch-src_bootstrap_builder.rs) = b686a545c001936f6da22f7a5b38ac1300c9869b
 SHA1 (patch-src_bootstrap_compile.rs) = c57799aee9c12603f5e6a13cb6b5befc8f96b4b6
 SHA1 (patch-src_bootstrap_lib.rs) = f6918e0939b6fe63ae9b524d4c809375149efb15
diff --git a/rust/patches/patch-compiler_rustc__llvm_build.rs b/rust/patches/patch-compiler_rustc__llvm_build.rs
index 7af182c085..a4e5c5a6c6 100644
--- a/rust/patches/patch-compiler_rustc__llvm_build.rs
+++ b/rust/patches/patch-compiler_rustc__llvm_build.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-compiler_rustc__llvm_build.rs,v 1.4 2021/11/20 16:09:46 he Exp $
 
 Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
 
diff --git a/rust/patches/patch-src_bootstrap_bootstrap.py b/rust/patches/patch-src_bootstrap_bootstrap.py
index ba9e8113bb..98d5cc9833 100644
--- a/rust/patches/patch-src_bootstrap_bootstrap.py
+++ b/rust/patches/patch-src_bootstrap_bootstrap.py
@@ -1,6 +1,7 @@
 $NetBSD: patch-src_bootstrap_bootstrap.py,v 1.4 2020/02/17 20:24:18 jperkin Exp $
 
 Use `uname -p` on NetBSD, as that is reliable and sensible there.
+Add -Copt-level=2 to RUSTFLAGS.
 Handle earmv7hf for NetBSD.
 
 --- src/bootstrap/bootstrap.py.orig	2021-02-10 17:36:44.000000000 +0000
@@ -39,3 +40,11 @@ Handle earmv7hf for NetBSD.
          else:
              ostype += 'eabihf'
      elif cputype == 'mips':
+@@ -936,6 +944,7 @@ class RustBuild(object):
+ 
+         # preserve existing RUSTFLAGS
+         env.setdefault("RUSTFLAGS", "")
++        env["RUSTFLAGS"] += " -Copt-level=2"
+         build_section = "target.{}".format(self.build)
+         target_features = []
+         if self.get_toml("crt-static", build_section) == "true":