src/tools/cargo/tests/testsuite/credential_process.rs | 14 7 + 7 - 0 !
src/tools/cargo/tests/testsuite/git_auth.rs | 4 2 + 2 - 0 !
src/tools/cargo/tests/testsuite/net_config.rs | 4 2 + 2 - 0 !
src/tools/cargo/tests/testsuite/publish.rs | 113 57 + 56 - 0 !
4 files changed, 68 insertions(+), 67 deletions(-)

 disable network tests

src/tools/cargo/crates/cargo-test-macro/src/lib.rs | 8 8 + 0 - 0 !
1 file changed, 8 insertions(+)

 c-2003-workaround-qemu-vfork-command-not-found

===================================================================

src/tools/cargo/tests/testsuite/cfg.rs | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 c-2200-workaround-x32-test

Bug: https://github.com/rust-lang/cargo/issues/10005

src/tools/cargo/tests/testsuite/metadata.rs | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 c-disable-fs-specific-test

===================================================================

src/tools/cargo/tests/testsuite/build_script.rs | 6 6 + 0 - 0 !
1 file changed, 6 insertions(+)

 [patch] tests: add missing cross disabled checks
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

cross_conmpile::alternate states it should only be used in test cases
after checking cross_compile::disabled(), which is missing here. these
tests fail despite setting CFG_DISABLE_CROSS_TESTS on i386, since both
the host and the alternate cross target would be i686 in that case.


Signed-off-by: Fabian Grnbichler <debian@fabian.gruenbichler.email>

src/tools/cargo/src/cargo/core/features.rs | 5 2 + 3 - 0 !
1 file changed, 2 insertions(+), 3 deletions(-)

 d-0012-cargo-always-return-dev-channel

src/bootstrap/src/core/config/config.rs | 28 26 + 2 - 0 !
1 file changed, 26 insertions(+), 2 deletions(-)

 fix get_toml() when cfg(test)

Bug: https://github.com/rust-lang/rust/issues/105766

src/tools/compiletest/src/runtest.rs | 5 5 + 0 - 0 !
tests/ui/issues/issue-21763.rs | 1 1 + 0 - 0 !
2 files changed, 6 insertions(+)

 [patch] fix ui tests with dist-vendored dependencies

There is already a workaround in `compiletest` to deal with custom
`CARGO_HOME` using `-Zignore-directory-in-diagnostics-source-blocks={}`.
A similar need exists when dependencies come from the local `vendor`
directory, which distro builds often use, so now we ignore that too.

Also, `issue-21763.rs` was normalizing `hashbrown-` paths, presumably
expecting a version suffix, but the vendored path doesn't include the
version. Now that matches `[\\/]hashbrown` instead.

library/alloc/tests/arc.rs | 1 1 + 0 - 0 !
library/alloc/tests/rc.rs | 1 1 + 0 - 0 !
2 files changed, 2 insertions(+)

 u-ignore-ppc-hangs

Bug: https://github.com/rust-lang/rust/issues/89607

compiler/rustc_llvm/build.rs | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 u-rustc-llvm-cross-flags

===================================================================

tests/run-make/long-linker-command-lines/foo.rs | 7 7 + 0 - 0 !
tests/ui/associated-consts/issue-93775.rs | 1 1 + 0 - 0 !
tests/ui/issues/issue-74564-if-expr-stack-overflow.rs | 1 1 + 0 - 0 !
tests/ui/threads-sendsync/mpsc_stress.rs | 1 1 + 0 - 0 !
4 files changed, 10 insertions(+)

 these tests hang or make the box oom

library/std/src/sync/mutex/tests.rs | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 d-ignore-test_arc_condvar_poison-ppc

src/bootstrap/src/core/config/tests.rs | 6 6 + 0 - 0 !
1 file changed, 6 insertions(+)

 d-disable-download-tests

src/tools/compiletest/src/runtest.rs | 6 6 + 0 - 0 !
src/tools/run-make-support/src/lib.rs | 15 15 + 0 - 0 !
2 files changed, 21 insertions(+)

 [patch] set the host library path in run-make v2
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

When the build is configured with `[rust] rpath = false`, we need to set
`LD_LIBRARY_PATH` (or equivalent) to what would have been the `RPATH`,
so the compiler can find its own libraries. The old `tools.mk` code has
this environment prefixed in the `$(BARE_RUSTC)` variable, so we just
need to wire up something similar for run-make v2.

This is now set while building each `rmake.rs` itself, as well as in the
`rust-make-support` helpers for `rustc` and `rustdoc` commands. This is
also available in a `set_host_rpath` function for manual commands, like
in the `compiler-builtins` test.

FG: Partial backport for 1.78
Signed-off-by: Fabian Grnbichler <debian@fabian.gruenbichler.email>

Cargo.toml | 7 0 + 7 - 0 !
src/bootstrap/bootstrap.py | 4 0 + 4 - 0 !
src/bootstrap/src/core/build_steps/test.rs | 12 1 + 11 - 0 !
src/bootstrap/src/core/builder.rs | 54 13 + 41 - 0 !
src/tools/rust-analyzer/Cargo.toml | 11 10 + 1 - 0 !
5 files changed, 24 insertions(+), 64 deletions(-)

 remove upstream parts that are not needed for the debian build, in
order to both reduce the orig tarball and the vendored crates within.

vendor/pkg-config/src/lib.rs | 26 11 + 15 - 0 !
vendor/pkg-config/tests/test.rs | 2 0 + 2 - 0 !
2 files changed, 11 insertions(+), 17 deletions(-)

 always enable cross compilation via pkgconf, and set the right binary name.

src/doc/rust-by-example/theme/index.hbs | 86 4 + 82 - 0 !
src/tools/linkchecker/main.rs | 28 26 + 2 - 0 !
vendor/mdbook/src/book/init.rs | 19 0 + 19 - 0 !
vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs | 104 17 + 87 - 0 !
vendor/mdbook/src/renderer/html_handlebars/search.rs | 2 0 + 2 - 0 !
vendor/mdbook/src/theme/index.hbs | 86 4 + 82 - 0 !
vendor/mdbook/src/theme/mod.rs | 27 0 + 27 - 0 !
vendor/mdbook/src/theme/searcher/mod.rs | 2 0 + 2 - 0 !
8 files changed, 51 insertions(+), 303 deletions(-)

 use https://github.com/infinity0/mdbook/tree/debian to help you rebase
the patch on top of a newer version. . Make sure the paths here match the ones
in debian/rust-doc.links

compiler/rustc/Cargo.toml | 6 0 + 6 - 0 !
src/tools/rust-analyzer/crates/profile/Cargo.toml | 2 0 + 2 - 0 !
2 files changed, 8 deletions(-)

 remove jemalloc-sys

src/tools/cargo/Cargo.toml | 6 2 + 4 - 0 !
1 file changed, 2 insertions(+), 4 deletions(-)

 remove all vendoring features of crates normally shipping bundled
C libs. that C code is stripped when repacking, so the features can't work
anyway.

vendor/curl-sys/Cargo.toml | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 remove dependency on libnghttp2-sys so it can be pruned.

compiler/rustc_codegen_ssa/Cargo.toml | 4 0 + 4 - 0 !
compiler/rustc_data_structures/Cargo.toml | 10 0 + 10 - 0 !
compiler/rustc_driver_impl/Cargo.toml | 6 0 + 6 - 0 !
compiler/rustc_errors/Cargo.toml | 8 0 + 8 - 0 !
compiler/rustc_session/Cargo.toml | 7 0 + 7 - 0 !
library/backtrace/Cargo.toml | 13 0 + 13 - 0 !
src/bootstrap/Cargo.toml | 15 0 + 15 - 0 !
src/tools/cargo/Cargo.toml | 26 4 + 22 - 0 !
src/tools/cargo/crates/cargo-test-support/Cargo.toml | 3 0 + 3 - 0 !
src/tools/cargo/crates/cargo-util/Cargo.toml | 7 0 + 7 - 0 !
src/tools/cargo/crates/home/Cargo.toml | 3 0 + 3 - 0 !
src/tools/cargo/credential/cargo-credential/Cargo.toml | 3 0 + 3 - 0 !
src/tools/cargo/src/cargo/util/auth/mod.rs | 5 0 + 5 - 0 !
src/tools/compiletest/Cargo.toml | 10 0 + 10 - 0 !
src/tools/rust-analyzer/crates/profile/Cargo.toml | 3 0 + 3 - 0 !
src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml | 6 0 + 6 - 0 !
src/tools/rust-analyzer/crates/stdx/Cargo.toml | 4 0 + 4 - 0 !
17 files changed, 4 insertions(+), 129 deletions(-)

 d-0020-remove-windows-dependencies

use something like

 find src compiler library -iname Cargo.toml -exec grep -H -n -e 'windows-sys' -e 'winapi' -e 'ntapi' -e 'wincon' -e 'winreg' -e 'windows' {} \;

to find and eliminate dependencies on windows-only crates when rebasing.

windows-bindgen and windows-metadata should not be removed, they are needed for
the build and don't pull in windows-sys and friends.

vendor/android-tzdata/Cargo.toml | 1 1 + 0 - 0 !
vendor/ansi_term/Cargo.toml | 3 0 + 3 - 0 !
vendor/anstream/Cargo.toml | 7 0 + 7 - 0 !
vendor/anstyle-query/Cargo.toml | 6 0 + 6 - 0 !
vendor/backtrace/Cargo.toml | 14 0 + 14 - 0 !
vendor/chrono/Cargo.toml | 10 1 + 9 - 0 !
vendor/colored/Cargo.toml | 7 0 + 7 - 0 !
vendor/console/Cargo.toml | 12 0 + 12 - 0 !
vendor/ctrlc/Cargo.toml | 18 0 + 18 - 0 !
vendor/curl-sys/Cargo.toml | 7 0 + 7 - 0 !
vendor/curl/Cargo.toml | 11 0 + 11 - 0 !
vendor/dirs-sys-0.3.7/Cargo.toml | 3 0 + 3 - 0 !
vendor/dirs-sys-next/Cargo.toml | 3 0 + 3 - 0 !
vendor/dlmalloc/Cargo.toml | 9 0 + 9 - 0 !
vendor/env_logger/Cargo.toml | 2 1 + 1 - 0 !
vendor/errno/Cargo.toml | 6 0 + 6 - 0 !
vendor/fd-lock/Cargo.toml | 8 0 + 8 - 0 !
vendor/filetime/Cargo.toml | 7 0 + 7 - 0 !
vendor/gix-sec/Cargo.toml | 13 0 + 13 - 0 !
vendor/home/Cargo.toml | 8 0 + 8 - 0 !
vendor/iana-time-zone/Cargo.toml | 3 0 + 3 - 0 !
vendor/ignore-0.4.20/Cargo.toml | 3 0 + 3 - 0 !
vendor/ignore/Cargo.toml | 2 0 + 2 - 0 !
vendor/is-terminal/Cargo.toml | 11 0 + 11 - 0 !
vendor/libloading/Cargo.toml | 7 0 + 7 - 0 !
vendor/libssh2-sys/Cargo.toml | 8 0 + 8 - 0 !
vendor/mio/Cargo.toml | 11 0 + 11 - 0 !
vendor/native-tls/Cargo.toml | 3 0 + 3 - 0 !
vendor/nu-ansi-term-0.46.0/Cargo.toml | 10 0 + 10 - 0 !
vendor/opener-0.5.2/Cargo.toml | 4 0 + 4 - 0 !
vendor/opener/Cargo.toml | 9 0 + 9 - 0 !
vendor/os_info/Cargo.toml | 15 0 + 15 - 0 !
vendor/parking_lot_core/Cargo.toml | 3 0 + 3 - 0 !
vendor/reqwest/Cargo.toml | 6 0 + 6 - 0 !
vendor/rustix/Cargo.toml | 17 0 + 17 - 0 !
vendor/same-file/Cargo.toml | 2 0 + 2 - 0 !
vendor/snapbox/Cargo.toml | 6 0 + 6 - 0 !
vendor/socket2/Cargo.toml | 10 0 + 10 - 0 !
vendor/stacker/Cargo.toml | 10 0 + 10 - 0 !
vendor/sysinfo/Cargo.toml | 41 0 + 41 - 0 !
vendor/tempfile/Cargo.toml | 7 0 + 7 - 0 !
vendor/term/Cargo.toml | 6 0 + 6 - 0 !
vendor/termcolor/Cargo.toml | 3 0 + 3 - 0 !
vendor/terminal_size/Cargo.toml | 7 0 + 7 - 0 !
vendor/termize/Cargo.toml | 3 0 + 3 - 0 !
vendor/tokio-native-tls/Cargo.toml | 17 0 + 17 - 0 !
vendor/tokio/Cargo.toml | 21 0 + 21 - 0 !
vendor/uuid/Cargo.toml | 1 0 + 1 - 0 !
vendor/walkdir/Cargo.toml | 3 0 + 3 - 0 !
vendor/yansi-term/Cargo.toml | 3 0 + 3 - 0 !
50 files changed, 3 insertions(+), 404 deletions(-)

 d-0021-vendor-remove-windows-dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

use something like

 find vendor -iname Cargo.toml -exec grep -H -n -e 'schannel' -e 'windows-sys' -e 'winapi' -e 'ntapi' -e 'wincon' -e 'winreg' -e 'windows' {} \;

to find dependencies on windows targets in vendored crates. you will likely
need to remove some hunks from this patch after pruning dependencies, since
hopefully a few of the crates patched during early rebasing are eliminated.

windows-bindgen and windows-metadata should not be removed, they are needed for
the build and don't pull in windows-sys and friends.

vendor/backtrace/src/symbolize/gimli.rs | 2 2 + 0 - 0 !
vendor/backtrace/src/symbolize/gimli/elf.rs | 2 1 + 1 - 0 !
vendor/backtrace/src/symbolize/gimli/libs_dl_iterate_phdr.rs | 20 12 + 8 - 0 !
3 files changed, 15 insertions(+), 9 deletions(-)

 add gnu/hurd support (rust-lang/backtrace-rs#567)

vendor/gix-index/src/fs.rs | 16 8 + 8 - 0 !
1 file changed, 8 insertions(+), 8 deletions(-)

 u-hurd-gix-index

commit daf3844c8f5ce6d0812e35677b1a46d568e226db

vendor/gix-index/src/fs.rs | 6 5 + 1 - 0 !
1 file changed, 5 insertions(+), 1 deletion(-)

 u-hurd-gix-index-2

===================================================================

vendor/socket2/src/sockaddr.rs | 2 2 + 0 - 0 !
vendor/socket2/src/sys/unix.rs | 1 1 + 0 - 0 !
2 files changed, 3 insertions(+)

 add hurd support

vendor/rustix/src/fs/mod.rs | 26 24 + 2 - 0 !
1 file changed, 24 insertions(+), 2 deletions(-)

 fix hurd build (#1064)

vendor/cc/src/lib.rs | 2 1 + 1 - 0 !
vendor/psm/build.rs | 7 2 + 5 - 0 !
2 files changed, 3 insertions(+), 6 deletions(-)

 d-0003-cc-psm-rebuild-wasm32

vendor/libgit2-sys/build.rs | 13 8 + 5 - 0 !
1 file changed, 8 insertions(+), 5 deletions(-)

---

src/bootstrap/src/core/builder.rs | 12 12 + 0 - 0 !
1 file changed, 12 insertions(+)

 d-bootstrap-rustflags

src/tools/rust-installer/install-template.sh | 7 5 + 2 - 0 !
1 file changed, 5 insertions(+), 2 deletions(-)

 install symlinks as-is, don't dereference them

Our patch to mdbook installs symlinks to systems versions of font-awesome,
highlight, etc. Upstream mdbook otherwise doesn't use symlinks, so this
doesn't affect anything else that's already generated.

src/bootstrap/src/core/build_steps/dist.rs | 6 4 + 2 - 0 !
src/bootstrap/src/utils/channel.rs | 6 6 + 0 - 0 !
2 files changed, 10 insertions(+), 2 deletions(-)

 don't check for cargo-vendor when building from (debian's) git

src/bootstrap/src/core/builder/tests.rs | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

 set tools to those built in debian

compiler/rustc_error_codes/src/error_codes/E0460.md | 2 1 + 1 - 0 !
compiler/rustc_error_codes/src/error_codes/E0461.md | 2 1 + 1 - 0 !
compiler/rustc_error_codes/src/error_codes/E0462.md | 2 1 + 1 - 0 !
compiler/rustc_error_codes/src/error_codes/E0514.md | 2 1 + 1 - 0 !
compiler/rustc_error_codes/src/error_codes/E0519.md | 2 1 + 1 - 0 !
src/doc/edition-guide/book.toml | 18 9 + 9 - 0 !
src/doc/edition-guide/src/editions/advanced-migrations.md | 14 7 + 7 - 0 !
src/doc/edition-guide/src/editions/transitioning-an-existing-project-to-a-new-edition.md | 4 2 + 2 - 0 !
src/doc/edition-guide/src/rust-2021/default-cargo-resolver.md | 10 5 + 5 - 0 !
src/doc/index.md | 2 1 + 1 - 0 !
src/doc/reference/src/conditional-compilation.md | 2 1 + 1 - 0 !
src/doc/reference/src/introduction.md | 4 2 + 2 - 0 !
src/doc/reference/src/linkage.md | 2 1 + 1 - 0 !
src/doc/reference/src/procedural-macros.md | 2 1 + 1 - 0 !
src/doc/rustc/src/linker-plugin-lto.md | 2 1 + 1 - 0 !
src/doc/rustc/src/platform-support/fuchsia.md | 2 1 + 1 - 0 !
src/doc/rustc/src/targets/custom.md | 2 1 + 1 - 0 !
src/doc/rustc/src/tests/index.md | 4 2 + 2 - 0 !
src/doc/rustc/src/what-is-rustc.md | 2 1 + 1 - 0 !
src/doc/unstable-book/src/compiler-flags/branch-protection.md | 2 1 + 1 - 0 !
src/doc/unstable-book/src/compiler-flags/control-flow-guard.md | 2 1 + 1 - 0 !
src/doc/unstable-book/src/compiler-flags/sanitizer.md | 2 1 + 1 - 0 !
src/tools/linkchecker/main.rs | 4 4 + 0 - 0 !
23 files changed, 47 insertions(+), 43 deletions(-)

 fix links to cargo-doc

src/bootstrap/src/core/build_steps/doc.rs | 27 21 + 6 - 0 !
1 file changed, 21 insertions(+), 6 deletions(-)

 d-bootstrap-use-local-css

src/bootstrap/src/lib.rs | 5 2 + 3 - 0 !
tests/codegen/remap_path_prefix/issue-73167-remap-std.rs | 2 1 + 1 - 0 !
2 files changed, 3 insertions(+), 4 deletions(-)

 d-bootstrap-custom-debuginfo-path

src/bootstrap/src/core/build_steps/dist.rs | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 partial revert of b9eedea4b0368fd1f00f204db75109ff444fab5b upstream

tests/ui/issues/issue-44056.rs | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 d-test-ignore-avx-44056

Bug: https://github.com/rust-lang/rust/pull/55667

src/bootstrap/src/core/build_steps/test.rs | 6 5 + 1 - 0 !
1 file changed, 5 insertions(+), 1 deletion(-)

 run panics if lldb is not installed and no output is produced..

src/etc/rust-gdbgui | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 hardcode gdb python module directory

Debian package installs python modules into a fixed directory, so
just hardcode path in wrapper script.

src/etc/rust-lldb | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 hardcode lldb python module directory

Debian package installs python modules into a fixed directory, so
just hardcode path in wrapper script.

compiler/rustc_codegen_ssa/src/back/link.rs | 7 7 + 0 - 0 !
1 file changed, 7 insertions(+)

 set dt_soname when building dylibs

In Rust, library filenames include a version-specific hash to help
the run-time linker find the correct version.  Unlike in C/C++, the
compiler looks for all libraries matching a glob that ignores the
hash and reads embedded metadata to work out versions, etc.

The upshot is that there is no need for the usual "libfoo.so ->
libfoo-1.2.3.so" symlink common with C/C++ when building with Rust,
and no need to communicate an alternate filename to use at run-time
vs compile time.  If linking to a Rust dylib from C/C++ however, a
"libfoo.so -> libfoo-$hash.so" symlink may well be useful and in
this case DT_SONAME=libfoo-$hash.so would be required.  More
mundanely, various tools (eg: dpkg-shlibdeps) complain if they don't
find DT_SONAME on shared libraries in public directories.

This patch passes -Wl,-soname=$outfile when building dylibs (and
using a GNU linker).

compiler/rustc_target/src/spec/base/windows_gnu.rs | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 d-rustc-windows-ssp

Bug: https://github.com/rust-lang/rust/issues/68973

compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs | 2 1 + 1 - 0 !
tests/ui/abi/homogenous-floats-target-feature-mixup.rs | 3 2 + 1 - 0 !
tests/ui/sse2.rs | 2 1 + 1 - 0 !
3 files changed, 4 insertions(+), 3 deletions(-)

 change i686 to match debian i386 baseline

see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=973414 , might need to be
adapted to reduce the baseline again

src/librustdoc/html/static/css/rustdoc.css | 8 0 + 8 - 0 !
src/librustdoc/html/static_files.rs | 2 0 + 2 - 0 !
2 files changed, 10 deletions(-)

 removed some embedded fonts

compiler/rustc_lint/src/builtin.rs | 5 4 + 1 - 0 !
compiler/rustc_lint_defs/src/builtin.rs | 2 2 + 0 - 0 !
2 files changed, 6 insertions(+), 1 deletion(-)

 ubuntu-disable-ppc64el-asm-tests

compiler/rustc_error_codes/src/error_codes/E0778.md | 4 2 + 2 - 0 !
compiler/rustc_error_codes/src/error_codes/E0779.md | 2 1 + 1 - 0 !
2 files changed, 3 insertions(+), 3 deletions(-)

 disable the doctests for the instruction_set errors

Bug: https://github.com/rust-lang/rust/issues/83453

compiler/rustc_target/src/target_features.rs | 2 0 + 2 - 0 !
tests/ui/abi/compatibility.rs | 2 1 + 1 - 0 !
tests/ui/check-cfg/mix.stderr | 2 1 + 1 - 0 !
tests/ui/check-cfg/well-known-values.stderr | 2 1 + 1 - 0 !
4 files changed, 3 insertions(+), 5 deletions(-)

 revert "loongarch: add frecipe and relax target feature"

This reverts commit e81df3f3225ce53921a87b9e490959c41b783b02.

Debian: this commit breaks a lot of tests on loong64 since our rustc build is
still based on LLVM-17. This revert should be dropped once we switch over to
LLVM 18.

Bug: https://github.com/rust-lang/rust/issues/114661