partial revert of b9eedea4b0368fd1f00f204db75109ff444fab5b upstream

Forwarded: not-needed

Gbp-Pq: Topic build
Gbp-Pq: Name d-bootstrap-permit-symlink-in-docs.patch

d-bootstrap-custom-debuginfo-path

Forwarded: not-needed
===================================================================

Gbp-Pq: Topic build
Gbp-Pq: Name d-bootstrap-custom-debuginfo-path.patch

d-bootstrap-use-local-css

Forwarded: not-needed
===================================================================

Gbp-Pq: Topic build
Gbp-Pq: Name d-bootstrap-use-local-css.patch

Fix links to cargo-doc

We package cargo docs in a slightly different location; also tweak linkchecker
to not fail these links.

Forwarded: not-needed

Gbp-Pq: Topic build
Gbp-Pq: Name d-bootstrap-cargo-doc-paths.patch

set tools to those built in Debian

Forwarded: not-needed
===================================================================

Gbp-Pq: Topic build
Gbp-Pq: Name d-bootstrap-no-assume-tools.patch

Don't check for cargo-vendor when building from (Debian's) git

Forwarded: not-needed

Gbp-Pq: Topic build
Gbp-Pq: Name d-bootstrap-disable-git.patch

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.

Forwarded: not-needed

Gbp-Pq: Topic build
Gbp-Pq: Name d-bootstrap-install-symlinks.patch

d-bootstrap-rustflags

Forwarded: not-needed

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

Gbp-Pq: Topic build
Gbp-Pq: Name d-bootstrap-rustflags.patch

d-0003-cc-psm-rebuild-wasm32

Forwarded: not-needed

Gbp-Pq: Topic vendor
Gbp-Pq: Name d-0003-cc-psm-rebuild-wasm32.patch

Fix hurd build (#1064)

Forwarded: https://github.com/bytecodealliance/rustix/pull/1064

Gbp-Pq: Topic vendor
Gbp-Pq: Name u-hurd-rustix.patch

add hurd support

Forwarded: https://github.com/rust-lang/socket2/pull/474

Gbp-Pq: Topic vendor
Gbp-Pq: Name u-hurd-socket2.patch

u-hurd-gix-index-2

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

Gbp-Pq: Topic vendor
Gbp-Pq: Name u-hurd-gix-index-2.patch

u-hurd-gix-index

commit daf3844c8f5ce6d0812e35677b1a46d568e226db
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sun May 26 21:13:40 2024 +0200

    hurd: fix accessing st_[mc]time

    GNU/Hurd uses a st_[mc]tim timespec, like aix

Gbp-Pq: Topic vendor
Gbp-Pq: Name u-hurd-gix-index.patch

u-hurd-backtrace

Forwarded: https://github.com/rust-lang/backtrace-rs/pull/567

Subject: Add GNU/Hurd support (rust-lang/backtrace-rs#567)

Gbp-Pq: Topic vendor
Gbp-Pq: Name u-hurd-backtrace.patch

d-0021-vendor-remove-windows-dependencies

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.

Forwarded: not-needed

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Gbp-Pq: Topic prune
Gbp-Pq: Name d-0021-vendor-remove-windows-dependencies.patch

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.

Forwarded: not-needed

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

Gbp-Pq: Topic prune
Gbp-Pq: Name d-0020-remove-windows-dependencies.patch

d-0011-cargo-remove-nghttp2

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

Last-Update: 2023-05-17

Forwarded: not-needed

Gbp-Pq: Topic prune
Gbp-Pq: Name d-0011-cargo-remove-nghttp2.patch

d-0010-cargo-remove-vendored-c-crates

Description: 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.

Forwarded: not-needed

Gbp-Pq: Topic prune
Gbp-Pq: Name d-0010-cargo-remove-vendored-c-crates.patch

d-0005-no-jemalloc

Description: remove jemalloc-sys

Forwarded: not-needed

Gbp-Pq: Topic prune
Gbp-Pq: Name d-0005-no-jemalloc.patch

d-0002-mdbook-strip-embedded-libs

Description: 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

Forwarded: not-needed

Gbp-Pq: Topic prune
Gbp-Pq: Name d-0002-mdbook-strip-embedded-libs.patch

d-0001-pkg-config-no-special-snowflake

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

Forwarded: not-needed

Gbp-Pq: Topic prune
Gbp-Pq: Name d-0001-pkg-config-no-special-snowflake.patch

d-0000-ignore-removed-submodules

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

Forwarded: not-needed

Gbp-Pq: Topic prune
Gbp-Pq: Name d-0000-ignore-removed-submodules.patch

[PATCH] Set the host library path in run-make v2

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 Grünbichler <debian@fabian.gruenbichler.email>
Forwarded: https://github.com/rust-lang/rust/pull/123763

Gbp-Pq: Topic upstream
Gbp-Pq: Name u-set-the-host-library-path-in-run-make-v2.patch

d-disable-download-tests

Forwarded: no

Gbp-Pq: Topic upstream
Gbp-Pq: Name d-disable-download-tests.patch

d-ignore-test_arc_condvar_poison-ppc

Forwarded: no

Gbp-Pq: Topic upstream
Gbp-Pq: Name d-ignore-test_arc_condvar_poison-ppc.patch

These tests hang or make the box OOM

Forwarded: no

Gbp-Pq: Topic upstream
Gbp-Pq: Name u-hurd-tests.patch

u-rustc-llvm-cross-flags

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

Gbp-Pq: Topic upstream
Gbp-Pq: Name u-rustc-llvm-cross-flags.patch

u-ignore-ppc-hangs

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

Gbp-Pq: Topic upstream
Gbp-Pq: Name u-ignore-ppc-hangs.patch

[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.

Forwarded: yes

Gbp-Pq: Topic upstream
Gbp-Pq: Name u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch

Fix get_toml() when cfg(test)

Bug: https://github.com/rust-lang/rust/issues/105766
Last-Update: 2023-03-29

When cfg(test), Config::parse doesn't parse a config.toml but uses default
values, failing when the initial rustc is needed. This is a workaround before
upstream issue gets solved.
Last-Update: 2023-03-29

Gbp-Pq: Topic upstream
Gbp-Pq: Name u-fix-get-toml-when-test.patch

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

Last-Update: 2023-05-30
Forwarded: not-needed

Gbp-Pq: Topic cargo
Gbp-Pq: Name d-0012-cargo-always-return-dev-channel.patch

[PATCH] tests: add missing cross disabled checks

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 Grünbichler <debian@fabian.gruenbichler.email>
Gbp-Pq: Topic cargo
Gbp-Pq: Name c-0003-tests-add-missing-cross-disabled-checks.patch

c-disable-fs-specific-test

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

Gbp-Pq: Topic cargo
Gbp-Pq: Name c-disable-fs-specific-test.patch

c-2200-workaround-x32-test

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

Gbp-Pq: Topic cargo
Gbp-Pq: Name c-2200-workaround-x32-test.patch

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

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

Gbp-Pq: Topic cargo
Gbp-Pq: Name c-2003-workaround-qemu-vfork-command-not-found.patch

Disable network tests

Forwarded: TODO

Gbp-Pq: Topic cargo
Gbp-Pq: Name c-2002_disable-net-tests.patch

rustc (1.78.0+dfsg1-2) unstable; urgency=medium

  * unbreak loongson64 build

[dgit import unpatched rustc 1.78.0+dfsg1-2]

Import rustc_1.78.0+dfsg1-2.debian.tar.xz

[dgit import tarball rustc 1.78.0+dfsg1-2 rustc_1.78.0+dfsg1-2.debian.tar.xz]

Import rustc_1.78.0+dfsg1.orig.tar.xz

[dgit import orig rustc_1.78.0+dfsg1.orig.tar.xz]