]>
git.proxmox.com Git - rustc.git/log
Fabian Grünbichler [Wed, 15 May 2024 05:20:59 +0000 (07:20 +0200)]
fix/ignore more tests
Gbp-Dch: Ignore
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Wed, 15 May 2024 05:19:48 +0000 (07:19 +0200)]
d/control: properly B+R old rustc packages
which contained the symlinks now shipped by rust-llvm
Closes: #1071005
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Wed, 8 May 2024 15:06:21 +0000 (17:06 +0200)]
bump version to 1.71.1+dfsg1-1~exp1
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Wed, 8 May 2024 16:45:21 +0000 (18:45 +0200)]
d/control: move LLVM symlinks to own package
these are dangling otherwise if the suggested packages are not
installed, but they are not needed on all systems, split them out into
their own package that can in turn have a hard dependency.
Closes: #1021868
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Rob Shearman [Sun, 24 Mar 2024 17:58:50 +0000 (17:58 +0000)]
Support finding llvm-profdata & llvm-cov with cargo-binutils
Currently, grcov fails with:
[ERROR] Error while executing llvm tools: We couldn't find llvm-profdata. Try installing the llvm-tools component with `rustup component add llvm-tools-preview`.
This is due to the application using cargo-binutils which looks for
llvm-profdata (and later llvm-cov) in
<rustc-sysroot>/lib/rustlib/<host-triple>/bin. [1]
Address this by adding llvm-profdata and llvm-cov links that allow
applications using cargo-binutils to find the tools without
workarounds. The targets of these links are provided by llvm-16 which
is recommended, but not a dependency. There is precedence for this
already though in rustc in the form of the rust-llvm-dwp link whose
target is also provided by llvm-16.
[1]: https://github.com/rust-embedded/cargo-binutils/blob/master/src/rustc.rs#L15
Fabian Grünbichler [Wed, 8 May 2024 16:18:32 +0000 (18:18 +0200)]
update d/copyright
Gbp-Dch: Ignore
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Wed, 8 May 2024 13:45:00 +0000 (15:45 +0200)]
d/control: add libssl and prefer curl with openssl
the direct dependency on libssl-dev was missing so far, but it was transitively
pulled in anyway. prefer curl with openssl instead of gnutls, even though curl
itself will still pull in gnutls and nettle even then, and libgit2 will pull in
mbedtls in addition..
Closes: #962508
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Fabian Grünbichler [Wed, 8 May 2024 13:15:44 +0000 (15:15 +0200)]
rust-src: ship Cargo.lock
to allow re-building libstd via `-Z build-std`
Closes: #1057736
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Fabian Grünbichler [Wed, 8 May 2024 09:41:58 +0000 (11:41 +0200)]
rust-doc: fix references to cargo-doc
Closes: #969210
Closes: #1063390
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Fabian Grünbichler [Tue, 7 May 2024 18:32:45 +0000 (20:32 +0200)]
config: disable git version
this auto-disables some tests that need a git commit hash.
Gbp-Dch: Ignore
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Fabian Grünbichler [Tue, 7 May 2024 13:10:57 +0000 (15:10 +0200)]
cherry-pick ui test fix
Gbp-Dch: Ignore
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Fabian Grünbichler [Tue, 7 May 2024 09:57:17 +0000 (11:57 +0200)]
rebase patches
Gbp-Dch: Ignore
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Fabian Grünbichler [Mon, 6 May 2024 12:53:46 +0000 (14:53 +0200)]
d/control: re-enable git nocheck B-D
t64-ready git is now available on all archs again.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Fabian Grünbichler [Mon, 6 May 2024 12:52:26 +0000 (14:52 +0200)]
d/control: remove B-D on cmake-3
it doesn't exist anymore.
Closes: #1067109
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Fabian Grünbichler [Mon, 6 May 2024 12:51:58 +0000 (14:51 +0200)]
d/control: tighten cargo versions
now that we have a matching cargo in the archive.
Closes: #1029007
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Fabian Grünbichler [Mon, 6 May 2024 13:03:50 +0000 (15:03 +0200)]
new upstream version 1.71.1
Closes: #1069019
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Fabian Grünbichler [Wed, 8 May 2024 15:28:12 +0000 (17:28 +0200)]
Update upstream source from tag 'upstream/1.71.1+dfsg1'
Update to upstream version '1.71.1+dfsg1'
with Debian dir
992d343549ce99fe09de0b3c14d0a99cebd2ac62
Fabian Grünbichler [Wed, 8 May 2024 15:27:53 +0000 (17:27 +0200)]
New upstream version 1.71.1+dfsg1
Fabian Grünbichler [Wed, 8 May 2024 07:32:03 +0000 (09:32 +0200)]
update unsuspicious list
Gbp-Dch: Ignore
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Fabian Grünbichler [Mon, 6 May 2024 12:58:04 +0000 (14:58 +0200)]
debian/update-versions.sh: drop cargo special casing
its version number is now identical to that of rustc
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Fabian Grünbichler [Mon, 6 May 2024 12:45:40 +0000 (14:45 +0200)]
Update Files-Excluded for new upstream version 1.71.1
Fabian Grünbichler [Mon, 6 May 2024 11:00:17 +0000 (13:00 +0200)]
d/prune-unused-deps: handle cargo-as-workspace
with 1.71.x, src/tools/cargo is a workspace (embedded as a git submodule
upstream), and no longer a member of the main workspace.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Fabian Grünbichler [Mon, 6 May 2024 09:13:38 +0000 (11:13 +0200)]
Update early-stage patches for 1.71.1+dfsg1
Fabian Grünbichler [Sat, 4 May 2024 11:38:43 +0000 (13:38 +0200)]
bump version to 1.70.0+dfsg2-1
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Fri, 3 May 2024 15:02:34 +0000 (17:02 +0200)]
bump version to 1.70.0+dfsg2-1~exp3
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Fri, 3 May 2024 15:01:02 +0000 (17:01 +0200)]
d/rules: fix last package cache removal
the build can be racy otherwise.
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Fri, 3 May 2024 11:28:03 +0000 (13:28 +0200)]
bumpv ersion to 1.70.0+dfsg2-1~exp2
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Fri, 3 May 2024 13:09:34 +0000 (15:09 +0200)]
autopkgtest: disable full build test
I am not sure we want to subject debci to that (yet)
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Fri, 3 May 2024 11:26:17 +0000 (13:26 +0200)]
d/rules: allow removal of package cache to fail
to allow all+any and separate builds to work.
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Fri, 3 May 2024 07:36:32 +0000 (09:36 +0200)]
bump version to 1.70.0+dfsg2-1~exp1
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Fri, 3 May 2024 08:48:17 +0000 (10:48 +0200)]
d/copyright: add missing section for prodash
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Fri, 3 May 2024 07:23:33 +0000 (09:23 +0200)]
Update upstream source from tag 'upstream/1.70.0+dfsg2'
Update to upstream version '1.70.0+dfsg2'
with Debian dir
3ac19a81e0800b1f187e72e20be4f282a5674dc2
Fabian Grünbichler [Fri, 3 May 2024 07:23:16 +0000 (09:23 +0200)]
New upstream version 1.70.0+dfsg2
Fabian Grünbichler [Fri, 3 May 2024 07:15:39 +0000 (09:15 +0200)]
extend lintian overrides
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Thu, 2 May 2024 16:11:08 +0000 (18:11 +0200)]
update d/copyright
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Fabian Grünbichler [Thu, 2 May 2024 17:01:13 +0000 (19:01 +0200)]
update upstream tarball whitelist
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Thu, 2 May 2024 16:11:07 +0000 (18:11 +0200)]
d/check-orig-suspicious: support extra tar ball
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Thu, 2 May 2024 16:11:07 +0000 (18:11 +0200)]
d/rules: properly install cargo docs
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Thu, 2 May 2024 16:11:07 +0000 (18:11 +0200)]
d/rules: remove package cache
to avoid it being shipped in the cargo package
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Thu, 2 May 2024 16:11:07 +0000 (18:11 +0200)]
fix autopkgtest control file
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Thu, 2 May 2024 16:11:07 +0000 (18:11 +0200)]
d/check-orig-suspicious.sh: remove duplicate comment stripping
this has been part of audit-vendor-source in the cargo package since 0.47.0 ..
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Thu, 2 May 2024 16:11:07 +0000 (18:11 +0200)]
guess-crate-copyright: switch to python3-toml
form pytoml, which is no longer available in bookworm or later
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Thu, 2 May 2024 16:11:07 +0000 (18:11 +0200)]
rules: handle extra vendored dependencies
such as git2 updates
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Tue, 16 Jan 2024 15:30:21 +0000 (16:30 +0100)]
add extra component
for updating cargo's git2 dependency
Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>
Fabian Gruenbichler [Sat, 6 Jan 2024 11:53:13 +0000 (12:53 +0100)]
cargo: actually install, not just build
Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>
Fabian Gruenbichler [Fri, 5 Jan 2024 19:48:29 +0000 (20:48 +0100)]
drop pruned vendored dependencies
Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>
Fabian Gruenbichler [Thu, 28 Dec 2023 13:18:27 +0000 (14:18 +0100)]
update d/copyright exclusions
Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>
Fabian Gruenbichler [Thu, 28 Dec 2023 13:12:35 +0000 (14:12 +0100)]
remove handling of cargo Cargo.lock
it's part of the main workspace, so has no separate lock file..
Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>
Fabian Gruenbichler [Thu, 28 Dec 2023 13:07:14 +0000 (14:07 +0100)]
rustix: simplify patch
won't be needed at all at some point, since later rustix versions have dropped
this altogether.
Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>
Fabian Gruenbichler [Thu, 28 Dec 2023 11:43:51 +0000 (12:43 +0100)]
d/control: temporarily downgrade cargo b-d
since we not yet have one available using the "new" version scheme
Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>
Fabian Gruenbichler [Thu, 28 Dec 2023 11:40:28 +0000 (12:40 +0100)]
rebase and adapt patches
Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>
Fabian Gruenbichler [Wed, 27 Dec 2023 19:59:39 +0000 (20:59 +0100)]
cargo: sync test disabling changes
Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>
Fabian Gruenbichler [Wed, 27 Dec 2023 19:56:47 +0000 (20:56 +0100)]
update libgit2
Signed-off-by: Fabian Gruenbichler <git@fabian.gruenbichler.email>
liushuyu [Wed, 6 Sep 2023 20:15:54 +0000 (14:15 -0600)]
d/copyright: remove Windows/macOS credential helpers
liushuyu [Wed, 6 Sep 2023 19:37:47 +0000 (13:37 -0600)]
d/patches: remove non-Linux submodules
liushuyu [Wed, 6 Sep 2023 18:14:58 +0000 (12:14 -0600)]
d/copyright: exclude Windows dependencies
liushuyu [Wed, 6 Sep 2023 18:05:24 +0000 (12:05 -0600)]
d/patches: remove Windows dependencies
liushuyu [Tue, 8 Aug 2023 07:53:46 +0000 (15:53 +0800)]
d/cargo.bash-completion: fix file path
liushuyu [Thu, 20 Jul 2023 14:18:12 +0000 (22:18 +0800)]
d/not-installed: ignore backup files
liushuyu [Thu, 20 Jul 2023 14:14:35 +0000 (22:14 +0800)]
d/cargo.bash-completion, d/not-installed: ...
... fix completion installation path
liushuyu [Thu, 20 Jul 2023 05:52:39 +0000 (13:52 +0800)]
d/rules: remove src/tools/cargo/Cargo.lock ...
... prior to build to avoid mismatching dependency versions
liushuyu [Tue, 18 Jul 2023 07:26:53 +0000 (15:26 +0800)]
d/prune-unused-deps: do the re-locking process for cargo ...
... now cargo uses its own workspace as well
liushuyu [Mon, 17 Jul 2023 09:34:43 +0000 (17:34 +0800)]
d/tests/control: remove architecture restrictions ...
... for the create-and-build-crate test. It's a very small program, it
should not run out of memory.
liushuyu [Wed, 12 Jul 2023 15:21:21 +0000 (23:21 +0800)]
d/patches/c-2201-always-enable-nightly-features.patch: remove ...
... it's no longer used
liushuyu [Wed, 12 Jul 2023 09:32:25 +0000 (17:32 +0800)]
d/tests: add a new smoke test for Cargo ...
... the test has been adapted by Zixing to include some new CLI
functions introduced in newer version of Cargo (like `cargo add`)
Co-Authored-By: Nick Rosbrook <nick.rosbrook@canonical.com>
liushuyu [Thu, 13 Jul 2023 03:15:25 +0000 (11:15 +0800)]
d/tests: remove Cargo self-build test ...
... it is already covered by a more comprehensive Rust full-self-build
test.
This also fixes (or avoids) the test failure caused by this Cargo
self-build test, since this rebuild test no longer works when Cargo is
included as a sub-project inside the Rust source tree.
liushuyu [Sun, 2 Jul 2023 21:50:06 +0000 (15:50 -0600)]
d/tests: merge cargo tests into the unified source package
liushuyu [Sun, 2 Jul 2023 21:20:07 +0000 (15:20 -0600)]
d/control: lock rustc and cargo versions ...
... in the dependency directives. Since Cargo will now report the rustc
version, it will no longer make sense to install a Cargo package that
has a version does not match the rustc version.
liushuyu [Mon, 26 Jun 2023 21:30:09 +0000 (15:30 -0600)]
d/control: add rust-doc as a recommended package to cargo-doc
liushuyu [Tue, 30 May 2023 18:53:04 +0000 (12:53 -0600)]
d/p/d-0012-cargo-always-return-dev-channel.patch: ...
... add a patch to make Cargo return dev channel and enable nightly
features. Because debhelper does use some nightly features
liushuyu [Wed, 24 May 2023 19:18:55 +0000 (13:18 -0600)]
d/p/c-2201-always-enable-nightly-features: ...
... always enable nightly features, regardless of actual release
channel. This is because dh-cargo and cargo helper scripts always use
some nightly features to avoid pulling dev dependencies into the build
liushuyu [Mon, 29 May 2023 17:58:19 +0000 (11:58 -0600)]
d/patches: add DEP-3 headers to new patches
liushuyu [Wed, 17 May 2023 02:26:52 +0000 (20:26 -0600)]
d/rules: remove .package-cache before installation ...
... otherwise debhelper will confuse the cache files with the actual
installed artifacts
liushuyu [Wed, 17 May 2023 00:31:54 +0000 (18:31 -0600)]
d/not-installed: workaround dh_missing reporting ...
... bash-completion not installed
liushuyu [Tue, 16 May 2023 19:16:55 +0000 (13:16 -0600)]
d/control, d/rules: install Cargo bash completion
liushuyu [Tue, 16 May 2023 05:58:25 +0000 (23:58 -0600)]
d/rules, d/cargo.*: build and install Cargo API docs
liushuyu [Tue, 16 May 2023 03:02:50 +0000 (21:02 -0600)]
d/patches: restore the usage of rustc-workspace-hack ...
... this unbreak the joint build of rustc and Cargo where some of the
crates have conflict features enabled. Using rustc-workspace-hack is the
officially recognized way to get around this impasse.
liushuyu [Tue, 16 May 2023 01:50:12 +0000 (19:50 -0600)]
d/rules: use system libssh2 ...
... because now we have Cargo in the tree and by default it will use
bundled libssh2
liushuyu [Tue, 16 May 2023 01:11:01 +0000 (19:11 -0600)]
d/patches: remove non-Linux platform modules
liushuyu [Mon, 15 May 2023 23:46:03 +0000 (17:46 -0600)]
d/config: enable Cargo module in the rustbuild configuration
liushuyu [Mon, 15 May 2023 21:50:40 +0000 (15:50 -0600)]
d/cargo.*: install Cargo-specific files
liushuyu [Tue, 31 Oct 2023 20:56:21 +0000 (14:56 -0600)]
d/rules: revise openssl source check
liushuyu [Mon, 15 May 2023 20:03:27 +0000 (14:03 -0600)]
d/patches, vendor: remove vendored C sources and prebuilt blobs
liushuyu [Fri, 12 May 2023 22:49:38 +0000 (16:49 -0600)]
d/patches: adapt Cargo-specific patches to the new source tree structure
liushuyu [Fri, 12 May 2023 22:31:14 +0000 (16:31 -0600)]
d/*: initial merge of cargo into rustc source package
Fabian Grünbichler [Mon, 25 Mar 2024 16:47:29 +0000 (17:47 +0100)]
bump version to 1.70.0+dfsg1-9
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Mon, 25 Mar 2024 16:44:09 +0000 (17:44 +0100)]
temporarily skip git(-cli) tests
git currently FTBFS, so it hasn't t64-transitioned yet, which makes this
build-dep unsatisfiable on armhf/armel and some ports.
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Mon, 25 Mar 2024 16:43:48 +0000 (17:43 +0100)]
d/changelog: fold in NMU
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Fri, 15 Mar 2024 16:18:58 +0000 (17:18 +0100)]
bump version to 1.70.0+dfsg1-8
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Fri, 15 Mar 2024 16:15:17 +0000 (17:15 +0100)]
d/rules: fix make warning in filter invocation
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Fri, 15 Mar 2024 16:14:56 +0000 (17:14 +0100)]
d/control: switch to pkgconf
instead of the transitional pkg-config
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Fri, 15 Mar 2024 15:58:49 +0000 (16:58 +0100)]
d/control: switch to libllvm16t64
will still require a rebootstrap+binNMU on armel/armhf..
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Thu, 15 Feb 2024 05:52:37 +0000 (06:52 +0100)]
bump to 1.70.0+dfsg1-7
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Thu, 15 Feb 2024 05:52:06 +0000 (06:52 +0100)]
profiler: disable on mips64el for now
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Sun, 11 Feb 2024 20:01:13 +0000 (21:01 +0100)]
bump version to 1.70.0+dfsg1-6
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Sun, 11 Feb 2024 19:47:59 +0000 (20:47 +0100)]
disable LLVM profiler support on sparc64
and allow easily extending the list of architectures where it doesn't
work (yet), if needed.
Closes: #1061125
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Fabian Grünbichler [Sat, 10 Feb 2024 17:12:25 +0000 (18:12 +0100)]
stage0: use current release architectures as default
dropping those which are no more, and adding riscv64. porters can still
override this as they see fit for their builds anyway.
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
Andres Salomon [Sat, 10 Feb 2024 04:44:12 +0000 (23:44 -0500)]
don't allow upstream's bootstrap.py to delete .cargo/ directory.
When we call bootstrap.bootstrap(args), the check_vendored_status()
upstream function will happily delete .cargo/. This is a problem
because the quilt source package wants .cargo/config.toml to not be
modified without a patch. Without this, after running
'debian/rules source_orig-stage0', further builds will fail with:
dpkg-source: warning: ignoring deletion of directory .cargo
dpkg-source: info: local changes detected, the modified files are:
rustc-1.70.0+dfsg1/.cargo/config.toml
dpkg-source: info: Hint: make sure the version in debian/changelog matches the unpacked source tree
dpkg-source: info: you can integrate the local changes with dpkg-source --commit
dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/rustc_1.70.0+dfsg1-6.diff.nkvdQ1
Rather than patching the upstream bootstrap.py, we just move .cargo out
of the way temporarily and move it back after the bootstrap() function
finishes.
Andres Salomon [Sat, 10 Feb 2024 03:59:39 +0000 (22:59 -0500)]
clean up after running make_orig-stage0_tarball.sh
Without this, the build/ directory will stick around after having run
make_orig-stage0_tarball.sh. When you then run the suggested command
'dpkg-source -b .', you'll get tons of these types of errors:
dpkg-source: error: cannot represent change to build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-
89bc084783fdc439 .rlib: binary file contents changed
Andres Salomon [Sat, 10 Feb 2024 01:26:51 +0000 (20:26 -0500)]
fix bootstrap build (source_orig-stage0 rule) to include all archs
In order to expand the various DEB_HOST_* variables when running
make_orig-stage0_tarball.sh, we were calling out to dpkg-architecture,
specifying for example -a<arch> -qDEB_HOST_ARCH. However, the
dpkg-architecture man page states:
You can specify the host architecture by providing one or both of the options
--host-arch and --host-type, otherwise the DEB_HOST_ARCH variable is used if set
(and --force not being specified).
[--host-arch is equivalent to -a]
DEB_HOST_ARCH is set somewhere else during the build, and is overriding
what dpkg-architecture returns. That's why, if run on an amd64 machine,
the bootstrap stage0.orig.tar.xz would only include the amd64 rustc
binary. We must pass --force (aka -f) to dpkg-architecture to get it to
return the proper results we're expecting.
This fixes https://bugs.debian.org/
1021711