From af35425fa37658887cc45e367a7bdf815f29280e Mon Sep 17 00:00:00 2001 From: semarie Date: Thu, 10 Mar 2022 13:18:43 +0000 Subject: [PATCH] remove RCSTag from lang/rust --- lang/rust/Makefile | 2 -- ...ch-compiler_rustc_mir_transform_src_abort_unwinding_calls_rs | 1 - .../rust/patches/patch-compiler_rustc_session_src_filesearch_rs | 2 +- ...patch-compiler_rustc_target_src_spec_i686_unknown_openbsd_rs | 2 +- lang/rust/patches/patch-library_std_src_sys_unix_os_rs | 2 +- lang/rust/patches/patch-src_bootstrap_bin_rustc_rs | 2 +- lang/rust/patches/patch-src_bootstrap_bootstrap_py | 1 - lang/rust/patches/patch-src_bootstrap_lib_rs | 2 +- lang/rust/patches/patch-src_bootstrap_test_rs | 1 - lang/rust/patches/patch-src_etc_rust-gdb | 2 +- .../patch-src_test_run-make-fulldeps_relocation-model_Makefile | 2 -- lang/rust/patches/patch-src_test_ui-fulldeps_myriad-closures_rs | 2 -- lang/rust/patches/patch-src_test_ui_abi_stack-probes-lto_rs | 2 +- lang/rust/patches/patch-src_test_ui_abi_stack-probes_rs | 2 +- lang/rust/patches/patch-src_test_ui_runtime_out-of-stack_rs | 2 -- lang/rust/patches/patch-src_test_ui_sse2_rs | 2 +- ...patch-src_tools_cargo_crates_cargo-test-support_src_paths_rs | 2 -- lang/rust/patches/patch-vendor_libgit2-sys_build_rs | 1 - lang/rust/patches/patch-vendor_openssl-sys_build_main_rs | 1 - lang/rust/pkg/PLIST-clippy | 1 - lang/rust/pkg/PLIST-gdb | 1 - lang/rust/pkg/PLIST-main | 1 - lang/rust/pkg/PLIST-rustfmt | 1 - 23 files changed, 9 insertions(+), 28 deletions(-) diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 193b7d16f8a..aab02129925 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,5 +1,3 @@ -# $OpenBSD: Makefile,v 1.140 2022/02/25 07:28:46 semarie Exp $ - ONLY_FOR_ARCHS = ${RUST_ARCHS} .if "${MACHINE_ARCH}" == "i386" diff --git a/lang/rust/patches/patch-compiler_rustc_mir_transform_src_abort_unwinding_calls_rs b/lang/rust/patches/patch-compiler_rustc_mir_transform_src_abort_unwinding_calls_rs index 352a3e06d3d..8d9d6a7518f 100644 --- a/lang/rust/patches/patch-compiler_rustc_mir_transform_src_abort_unwinding_calls_rs +++ b/lang/rust/patches/patch-compiler_rustc_mir_transform_src_abort_unwinding_calls_rs @@ -1,4 +1,3 @@ -$OpenBSD: patch-compiler_rustc_mir_transform_src_abort_unwinding_calls_rs,v 1.1 2021/12/02 14:59:19 semarie Exp $ Workaround for sparc64 https://github.com/rust-lang/rust/issues/90064 diff --git a/lang/rust/patches/patch-compiler_rustc_session_src_filesearch_rs b/lang/rust/patches/patch-compiler_rustc_session_src_filesearch_rs index e40373cfef9..ab40d886df1 100644 --- a/lang/rust/patches/patch-compiler_rustc_session_src_filesearch_rs +++ b/lang/rust/patches/patch-compiler_rustc_session_src_filesearch_rs @@ -1,5 +1,5 @@ -$OpenBSD: patch-compiler_rustc_session_src_filesearch_rs,v 1.4 2021/12/02 14:59:19 semarie Exp $ fallback to LOCALBASE as default sysroot. + Index: compiler/rustc_session/src/filesearch.rs --- compiler/rustc_session/src/filesearch.rs.orig +++ compiler/rustc_session/src/filesearch.rs diff --git a/lang/rust/patches/patch-compiler_rustc_target_src_spec_i686_unknown_openbsd_rs b/lang/rust/patches/patch-compiler_rustc_target_src_spec_i686_unknown_openbsd_rs index b9923c60af0..cf93083df5d 100644 --- a/lang/rust/patches/patch-compiler_rustc_target_src_spec_i686_unknown_openbsd_rs +++ b/lang/rust/patches/patch-compiler_rustc_target_src_spec_i686_unknown_openbsd_rs @@ -1,6 +1,6 @@ -$OpenBSD: patch-compiler_rustc_target_src_spec_i686_unknown_openbsd_rs,v 1.5 2021/06/20 18:07:09 semarie Exp $ i386 should be pentiumpro (no SSE2, no ...) pass -znotext to avoid relocation problem with __rust_probestack symbol + Index: compiler/rustc_target/src/spec/i686_unknown_openbsd.rs --- compiler/rustc_target/src/spec/i686_unknown_openbsd.rs.orig +++ compiler/rustc_target/src/spec/i686_unknown_openbsd.rs diff --git a/lang/rust/patches/patch-library_std_src_sys_unix_os_rs b/lang/rust/patches/patch-library_std_src_sys_unix_os_rs index db4b0ff5c3f..2ee44ab42ff 100644 --- a/lang/rust/patches/patch-library_std_src_sys_unix_os_rs +++ b/lang/rust/patches/patch-library_std_src_sys_unix_os_rs @@ -1,5 +1,5 @@ -$OpenBSD: patch-library_std_src_sys_unix_os_rs,v 1.9 2022/02/25 07:28:46 semarie Exp $ argv0 isn't suitable as current_exe() in all cases. + Index: library/std/src/sys/unix/os.rs --- library/std/src/sys/unix/os.rs.orig +++ library/std/src/sys/unix/os.rs diff --git a/lang/rust/patches/patch-src_bootstrap_bin_rustc_rs b/lang/rust/patches/patch-src_bootstrap_bin_rustc_rs index 232c2ae6b60..bb6d01bd52d 100644 --- a/lang/rust/patches/patch-src_bootstrap_bin_rustc_rs +++ b/lang/rust/patches/patch-src_bootstrap_bin_rustc_rs @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_bootstrap_bin_rustc_rs,v 1.18 2022/02/25 07:28:46 semarie Exp $ try to reduce memory usage on aarch64 and i386: - reduce memory use by retaining fewer names within compilation artifacts - divise (with codegen-units) the unit in smaller parts to manipulate it + Index: src/bootstrap/bin/rustc.rs --- src/bootstrap/bin/rustc.rs.orig +++ src/bootstrap/bin/rustc.rs diff --git a/lang/rust/patches/patch-src_bootstrap_bootstrap_py b/lang/rust/patches/patch-src_bootstrap_bootstrap_py index d11c56b2e7d..1bfc2f241ce 100644 --- a/lang/rust/patches/patch-src_bootstrap_bootstrap_py +++ b/lang/rust/patches/patch-src_bootstrap_bootstrap_py @@ -1,4 +1,3 @@ -$OpenBSD: patch-src_bootstrap_bootstrap_py,v 1.20 2022/02/25 07:28:46 semarie Exp $ Workaround for sparc64: bootstrap segfaults without -O3 Index: src/bootstrap/bootstrap.py diff --git a/lang/rust/patches/patch-src_bootstrap_lib_rs b/lang/rust/patches/patch-src_bootstrap_lib_rs index 8a70a15a630..6d2cd4e70c0 100644 --- a/lang/rust/patches/patch-src_bootstrap_lib_rs +++ b/lang/rust/patches/patch-src_bootstrap_lib_rs @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_bootstrap_lib_rs,v 1.40 2022/02/25 07:28:46 semarie Exp $ let us compilation choice to be honored. https://github.com/rust-lang/rust/issues/39900 + Index: src/bootstrap/lib.rs --- src/bootstrap/lib.rs.orig +++ src/bootstrap/lib.rs diff --git a/lang/rust/patches/patch-src_bootstrap_test_rs b/lang/rust/patches/patch-src_bootstrap_test_rs index 1f392481f1d..553848cb80d 100644 --- a/lang/rust/patches/patch-src_bootstrap_test_rs +++ b/lang/rust/patches/patch-src_bootstrap_test_rs @@ -1,4 +1,3 @@ -$OpenBSD: patch-src_bootstrap_test_rs,v 1.24 2022/01/14 07:18:46 semarie Exp $ Disable "Bootstrap" test by default (it requires network). Index: src/bootstrap/test.rs diff --git a/lang/rust/patches/patch-src_etc_rust-gdb b/lang/rust/patches/patch-src_etc_rust-gdb index 71f3384bd8b..e41c6d65874 100644 --- a/lang/rust/patches/patch-src_etc_rust-gdb +++ b/lang/rust/patches/patch-src_etc_rust-gdb @@ -1,5 +1,5 @@ -$OpenBSD: patch-src_etc_rust-gdb,v 1.9 2020/06/09 06:39:30 semarie Exp $ use egdb (gdb from ports) + Index: src/etc/rust-gdb --- src/etc/rust-gdb.orig +++ src/etc/rust-gdb diff --git a/lang/rust/patches/patch-src_test_run-make-fulldeps_relocation-model_Makefile b/lang/rust/patches/patch-src_test_run-make-fulldeps_relocation-model_Makefile index 7a0d81bddb9..1eff07091c7 100644 --- a/lang/rust/patches/patch-src_test_run-make-fulldeps_relocation-model_Makefile +++ b/lang/rust/patches/patch-src_test_run-make-fulldeps_relocation-model_Makefile @@ -1,5 +1,3 @@ -$OpenBSD: patch-src_test_run-make-fulldeps_relocation-model_Makefile,v 1.1 2018/05/22 06:04:33 landry Exp $ - Index: src/test/run-make-fulldeps/relocation-model/Makefile --- src/test/run-make-fulldeps/relocation-model/Makefile.orig +++ src/test/run-make-fulldeps/relocation-model/Makefile diff --git a/lang/rust/patches/patch-src_test_ui-fulldeps_myriad-closures_rs b/lang/rust/patches/patch-src_test_ui-fulldeps_myriad-closures_rs index 6af5ef8ba8b..b455a1b934c 100644 --- a/lang/rust/patches/patch-src_test_ui-fulldeps_myriad-closures_rs +++ b/lang/rust/patches/patch-src_test_ui-fulldeps_myriad-closures_rs @@ -1,5 +1,3 @@ -$OpenBSD: patch-src_test_ui-fulldeps_myriad-closures_rs,v 1.1 2019/09/29 08:23:17 semarie Exp $ - Index: src/test/ui-fulldeps/myriad-closures.rs --- src/test/ui-fulldeps/myriad-closures.rs.orig +++ src/test/ui-fulldeps/myriad-closures.rs diff --git a/lang/rust/patches/patch-src_test_ui_abi_stack-probes-lto_rs b/lang/rust/patches/patch-src_test_ui_abi_stack-probes-lto_rs index 89828d700f7..99b89e07418 100644 --- a/lang/rust/patches/patch-src_test_ui_abi_stack-probes-lto_rs +++ b/lang/rust/patches/patch-src_test_ui_abi_stack-probes-lto_rs @@ -1,5 +1,5 @@ -$OpenBSD: patch-src_test_ui_abi_stack-probes-lto_rs,v 1.2 2021/02/13 18:31:24 semarie Exp $ Disable stack-probes test (MAP_STACK terminate the process in a way the testsuite fails). + Index: src/test/ui/abi/stack-probes-lto.rs --- src/test/ui/abi/stack-probes-lto.rs.orig +++ src/test/ui/abi/stack-probes-lto.rs diff --git a/lang/rust/patches/patch-src_test_ui_abi_stack-probes_rs b/lang/rust/patches/patch-src_test_ui_abi_stack-probes_rs index fdaaf4dd3ec..3df032d3ff5 100644 --- a/lang/rust/patches/patch-src_test_ui_abi_stack-probes_rs +++ b/lang/rust/patches/patch-src_test_ui_abi_stack-probes_rs @@ -1,5 +1,5 @@ -$OpenBSD: patch-src_test_ui_abi_stack-probes_rs,v 1.2 2021/02/13 18:31:24 semarie Exp $ Disable stack-probes test (MAP_STACK terminate the process in a way the testsuite fails). + Index: src/test/ui/abi/stack-probes.rs --- src/test/ui/abi/stack-probes.rs.orig +++ src/test/ui/abi/stack-probes.rs diff --git a/lang/rust/patches/patch-src_test_ui_runtime_out-of-stack_rs b/lang/rust/patches/patch-src_test_ui_runtime_out-of-stack_rs index baa9e8fcf82..6ef790a8a67 100644 --- a/lang/rust/patches/patch-src_test_ui_runtime_out-of-stack_rs +++ b/lang/rust/patches/patch-src_test_ui_runtime_out-of-stack_rs @@ -1,5 +1,3 @@ -$OpenBSD: patch-src_test_ui_runtime_out-of-stack_rs,v 1.1 2022/01/14 07:18:46 semarie Exp $ - Index: src/test/ui/runtime/out-of-stack.rs --- src/test/ui/runtime/out-of-stack.rs.orig +++ src/test/ui/runtime/out-of-stack.rs diff --git a/lang/rust/patches/patch-src_test_ui_sse2_rs b/lang/rust/patches/patch-src_test_ui_sse2_rs index 08652af3c34..6c00ef3ace6 100644 --- a/lang/rust/patches/patch-src_test_ui_sse2_rs +++ b/lang/rust/patches/patch-src_test_ui_sse2_rs @@ -1,5 +1,5 @@ -$OpenBSD: patch-src_test_ui_sse2_rs,v 1.2 2021/02/13 18:31:24 semarie Exp $ Disable SSE2 tests for i386. + Index: src/test/ui/sse2.rs --- src/test/ui/sse2.rs.orig +++ src/test/ui/sse2.rs diff --git a/lang/rust/patches/patch-src_tools_cargo_crates_cargo-test-support_src_paths_rs b/lang/rust/patches/patch-src_tools_cargo_crates_cargo-test-support_src_paths_rs index 41e290d2c58..ea95e650949 100644 --- a/lang/rust/patches/patch-src_tools_cargo_crates_cargo-test-support_src_paths_rs +++ b/lang/rust/patches/patch-src_tools_cargo_crates_cargo-test-support_src_paths_rs @@ -1,5 +1,3 @@ -$OpenBSD: patch-src_tools_cargo_crates_cargo-test-support_src_paths_rs,v 1.6 2021/09/09 15:07:40 semarie Exp $ - Index: src/tools/cargo/crates/cargo-test-support/src/paths.rs --- src/tools/cargo/crates/cargo-test-support/src/paths.rs.orig +++ src/tools/cargo/crates/cargo-test-support/src/paths.rs diff --git a/lang/rust/patches/patch-vendor_libgit2-sys_build_rs b/lang/rust/patches/patch-vendor_libgit2-sys_build_rs index f54d90cf2d9..d9ccb2f1118 100644 --- a/lang/rust/patches/patch-vendor_libgit2-sys_build_rs +++ b/lang/rust/patches/patch-vendor_libgit2-sys_build_rs @@ -1,4 +1,3 @@ -$OpenBSD: patch-vendor_libgit2-sys_build_rs,v 1.1 2022/02/25 07:28:46 semarie Exp $ libgit2: force embedded version Index: vendor/libgit2-sys/build.rs diff --git a/lang/rust/patches/patch-vendor_openssl-sys_build_main_rs b/lang/rust/patches/patch-vendor_openssl-sys_build_main_rs index 54386f21652..bf41296520c 100644 --- a/lang/rust/patches/patch-vendor_openssl-sys_build_main_rs +++ b/lang/rust/patches/patch-vendor_openssl-sys_build_main_rs @@ -1,4 +1,3 @@ -$OpenBSD: patch-vendor_openssl-sys_build_main_rs,v 1.7 2021/09/09 15:07:40 semarie Exp $ The LibreSSL version in -current isn't explicitly supported. Index: vendor/openssl-sys/build/main.rs --- vendor/openssl-sys/build/main.rs.orig diff --git a/lang/rust/pkg/PLIST-clippy b/lang/rust/pkg/PLIST-clippy index 3c4857a1b58..e9cdfe131be 100644 --- a/lang/rust/pkg/PLIST-clippy +++ b/lang/rust/pkg/PLIST-clippy @@ -1,4 +1,3 @@ -@comment $OpenBSD: PLIST-clippy,v 1.2 2020/04/18 06:47:10 semarie Exp $ @bin bin/cargo-clippy @bin bin/clippy-driver share/doc/clippy/ diff --git a/lang/rust/pkg/PLIST-gdb b/lang/rust/pkg/PLIST-gdb index 9257525444e..a24a5b710e6 100644 --- a/lang/rust/pkg/PLIST-gdb +++ b/lang/rust/pkg/PLIST-gdb @@ -1,4 +1,3 @@ -@comment $OpenBSD: PLIST-gdb,v 1.5 2020/11/05 09:21:35 semarie Exp $ bin/rust-gdb @comment bin/rust-gdbgui lib/rustlib/etc/ diff --git a/lang/rust/pkg/PLIST-main b/lang/rust/pkg/PLIST-main index 81e9b2a2636..40418c15e2e 100644 --- a/lang/rust/pkg/PLIST-main +++ b/lang/rust/pkg/PLIST-main @@ -1,4 +1,3 @@ -@comment $OpenBSD: PLIST-main,v 1.38 2022/02/25 07:28:46 semarie Exp $ @conflict cargo-<0.20.0 @pkgpath devel/cargo @bin bin/cargo diff --git a/lang/rust/pkg/PLIST-rustfmt b/lang/rust/pkg/PLIST-rustfmt index 342caf47820..38f2b8006d3 100644 --- a/lang/rust/pkg/PLIST-rustfmt +++ b/lang/rust/pkg/PLIST-rustfmt @@ -1,4 +1,3 @@ -@comment $OpenBSD: PLIST-rustfmt,v 1.1 2018/12/16 09:19:57 semarie Exp $ @bin bin/cargo-fmt @bin bin/rustfmt share/doc/rustfmt/