From: Peter Michael Green Date: Sun, 28 Jul 2024 17:29:39 +0000 (+0000) Subject: Merge tag '1.74.1+dfsg1-1' into trixie-staging X-Git-Tag: archive/raspbian/1.74.1+dfsg1-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4f6b71cc579cf8118e2d8a0c511ae7c547676c5e;p=rustc.git Merge tag '1.74.1+dfsg1-1' into trixie-staging --- 4f6b71cc579cf8118e2d8a0c511ae7c547676c5e diff --cc debian/architecture.mk index fb41c65698,bbf81eef05..3cde33a8cc --- a/debian/architecture.mk +++ b/debian/architecture.mk @@@ -3,8 -3,14 +3,13 @@@ include /usr/share/dpkg/architecture.mk rust_cpu = $(subst i586,i686,\ - $(if $(findstring -riscv64-,-$(2)-),$(subst riscv64,riscv64gc,$(1)),$(1))) - rust_type_setvar = $(1)_RUST_TYPE ?= $(call rust_cpu,$($(1)_GNU_CPU),$($(1)_ARCH))-unknown-$($(1)_GNU_SYSTEM) + $(if $(findstring -riscv64-,-$(2)-),$(subst riscv64,riscv64gc,$(1)),\ -$(if $(findstring -armhf-,-$(2)-),$(subst arm,armv7,$(1)),\ + $(if $(findstring -armel-,-$(2)-),$(subst arm,armv5te,$(1)),\ -$(1))))) ++$(1)))) + + rust_os = $(if $(findstring -hurd-,-$(2)-),$(subst gnu,hurd-gnu,$(1)),$1) + + rust_type_setvar = $(1)_RUST_TYPE ?= $(call rust_cpu,$($(1)_GNU_CPU),$($(1)_ARCH))-unknown-$(call rust_os,$($(1)_GNU_SYSTEM),$($(1)_ARCH_OS)) $(foreach machine,BUILD HOST TARGET,\ $(eval $(call rust_type_setvar,DEB_$(machine)))) diff --cc debian/changelog index 045dd5401e,d54e5dae47..b54fd08331 --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,21 +1,38 @@@ - rustc (1.73.0+dfsg1-1+rpi1) trixie-staging; urgency=medium ++rustc (1.74.1+dfsg1-1+rpi1) trixie-staging; urgency=medium + + [changes brought forward from 1.15.1+dfsg1-1~exp3+rpi1 by Peter Michael Green at Wed, 15 Mar 2017 10:16:18 +0000] + * Build for armv6. + [changes introduced in 1.18.0+dfsg1-4+rpi1 by Peter Michael Green] + * Disable testsuite. + [changes introduced in 1.37.0+dfsg1-1+rpi1 by Peter Michael Green] + * Set DEB_BUILD_RUST_TYPE based on the compiler that is actually installed. + [changes introduced in 1.42.0+dfsg1-1+rpi1 by Peter Michael Green] + * Use the compiler itself rather than dpkg to detect DEB_BUILD_RUST_TYPE + [changes introduced in 1.57.0+dfsg1-1+rpi1 by Peter Michael Green] + * Disable testsuite for arch all builds as well. + [changes introduced in 1.70.0+dfsg1-7+rpi2 by Peter Micheal Green] + * Remove max version constraint from wasi-libc build-dependency. + + -- Peter Michael Green Sat, 27 Jul 2024 03:37:15 +0000 + + rustc (1.74.1+dfsg1-1) unstable; urgency=medium + + * dwz: bump limit to avoid s390x build failures + + -- Fabian Grünbichler Thu, 30 May 2024 11:25:53 +0200 + + rustc (1.74.1+dfsg1-1~exp1) experimental; urgency=medium + + [ Fabian Grünbichler ] + * New upstream release + + [ Samuel Thibault ] + * architecture.mk: Adapt to llvm/rust's hurd naming + * rules: Disable profiling on Hurd ports, llvm does not provide it yet + * rules: Set the number of expected failures on Hurd ports + + -- Fabian Grünbichler Wed, 29 May 2024 11:24:48 +0200 + rustc (1.73.0+dfsg1-1) unstable; urgency=medium * libstd-rust-1.73: fix ldconfig trigger