bootstrap: revert cross-build breaking change

this reverts 68034f837a39387e49fc7d7c5b088f5372a1127e modulo file split that
happened afterwards.

Forwarded: https://github.com/rust-lang/rust/issues/133629

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Gbp-Pq: Topic bootstrap
Gbp-Pq: Name bootstrap-revert-cross-build-breaking-change.patch

proc-macro-srv: make usage of RTLD_DEEPBIND portable

the constant is wrong on some platforms (e.g., on mips64el it's 0x10, and 0x8
is RTLD_NOLOAD which makes all this functionality broken), the libc crate takes
care of those differences for us.

fallback to old hard-coded value for non-glibc environments (which might or
might not of DEEPBIND support).

Forwarded: https://github.com/rust-lang/rust/pull/135591

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Gbp-Pq: Topic behaviour
Gbp-Pq: Name proc-macro-srv-make-usage-of-RTLD_DEEPBIND-portable.patch

bootstrap: don't attempt to download rustc in tests

the tests use a default config, so we need to manually override this
option..

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Gbp-Pq: Topic build
Gbp-Pq: Name bootstrap-don-t-attempt-to-download-rustc-in-tests.patch

ci_rustc: disable test that requires upstream git repo

Forwarded: not-needed

Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>
Gbp-Pq: Topic build
Gbp-Pq: Name ci_rustc-disable-test-that-requires-upstream-git-repo.patch

blake3: skip embedded C code, use pure implementation

Forwarded: not-needed

Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>
Gbp-Pq: Topic vendor
Gbp-Pq: Name blake3-skip-embedded-C-code-use-pure-implementation.patch

ignore broken debuginfo tests

Forwarded: yes

Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>
Gbp-Pq: Topic build
Gbp-Pq: Name ignore-broken-debuginfo-tests.patch

disable broken i386 tests

Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>
Gbp-Pq: Topic build
Gbp-Pq: Name disable-broken-i386-tests.patch

bootstrap tests: disable compiler-rt optimizing

it cannot work since there are no bundled LLVM (and thus no bundled
compiler-rt) sources available. during the regular build this is handled by our
config, but bootstrap tests don't use that..

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Gbp-Pq: Topic build
Gbp-Pq: Name bootstrap-tests-disable-compiler-rt-optimizing.patch

libz-sys: allow cross-building

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Gbp-Pq: Topic vendor
Gbp-Pq: Name libz-sys-allow-cross-building.patch

onig_sys: use system lib

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Gbp-Pq: Topic vendor
Gbp-Pq: Name onig_sys-use-system-lib.patch

Disable the doctests for the instruction_set errors

Bug: https://github.com/rust-lang/rust/issues/83453
Last-Update: 2022-02-23

The fix is as described in the upstream issue.

Gbp-Pq: Topic ubuntu
Gbp-Pq: Name ubuntu-ignore-arm-doctest.patch

ubuntu-disable-ppc64el-asm-tests

Forwarded: not-needed

Gbp-Pq: Topic ubuntu
Gbp-Pq: Name ubuntu-disable-ppc64el-asm-tests.patch

removed some embedded fonts

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

Gbp-Pq: Topic behaviour
Gbp-Pq: Name d-rustdoc-disable-embedded-fonts.patch

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

Forwarded: not-needed

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

Gbp-Pq: Topic behaviour
Gbp-Pq: Name d-rustc-i686-baseline.patch

d-rustc-windows-ssp

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

Gbp-Pq: Topic behaviour
Gbp-Pq: Name d-rustc-windows-ssp.patch

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

Forwarded: no

Gbp-Pq: Topic behaviour
Gbp-Pq: Name d-rustc-add-soname.patch

Hardcode LLDB python module directory

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

Forwarded: not-needed

Gbp-Pq: Topic behaviour
Gbp-Pq: Name d-rust-lldb-paths.patch

Hardcode GDB python module directory

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

Forwarded: not-needed

Gbp-Pq: Topic behaviour
Gbp-Pq: Name d-rust-gdb-paths.patch

d-test-ignore-avx-44056

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

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

Gbp-Pq: Topic build
Gbp-Pq: Name d-test-ignore-avx-44056.patch

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

bootstrap: always use commit info file instead of checking .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

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' -e 'winsplit' {} \;

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-0007-no-tzdb

Description: remove jiff-tzdb(-platform)

on Debian, we can just use the tzdata information..

Forwarded: not-needed

Gbp-Pq: Topic prune
Gbp-Pq: Name d-0007-no-tzdb.patch

d-0006-no-mimalloc

Description: remove mimalloc(-sys)

Forwarded: not-needed

Gbp-Pq: Topic prune
Gbp-Pq: Name d-0006-no-mimalloc.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

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

compiletest: add ignore-hurd support and annotate some tests

These tests hang or make the box OOM

Forwarded: no

Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>
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

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.85.0+dfsg1-1) unstable; urgency=medium

  * New (stable) upstream release.

[dgit import unpatched rustc 1.85.0+dfsg1-1]

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

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

Import rustc_1.85.0+dfsg1-1.debian.tar.xz

[dgit import tarball rustc 1.85.0+dfsg1-1 rustc_1.85.0+dfsg1-1.debian.tar.xz]