On 28/07/2022 18:23, Emilio Pozuelo Monfort wrote:
On 14/07/2022 11:02, Emilio Pozuelo Monfort wrote:
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-Cc: pkg-rust-maintain...@alioth-lists.debian.net
Hi,
This updates rustc-mozilla in buster, in preparation for Firefox 102.
I'm attaching the debdiff from the bullseye update. The windows target
is disabled because it was already disabled in buster, and is something
we don't really care about for our purpose.
I've uploaded the package already to oldstable-new.
I've added a couple of changes to fix the FTBFS on i386 and arm64. debdiff
attached and package uploaded.
Following the bullseye update, this one adds the mips(el) binaries to buster.
Package uploaded, and debian/ diff attached.
Cheers,
Emilio
diff -ruNp debian.deb10u2/changelog debian.deb10u3/changelog
--- debian.deb10u2/changelog 2022-07-28 18:16:59.000000000 +0200
+++ debian.deb10u3/changelog 2022-08-04 09:50:12.000000000 +0200
@@ -1,3 +1,9 @@
+rustc-mozilla (1.59.0+dfsg1-1~deb10u3) buster; urgency=medium
+
+ * Include mips(el) stage0 binaries.
+
+ -- Emilio Pozuelo Monfort <po...@debian.org> Thu, 04 Aug 2022 09:50:12 +0200
+
rustc-mozilla (1.59.0+dfsg1-1~deb10u2) buster; urgency=medium
* Inline atomics on arm64.
diff -ruNp debian.deb10u2/rules debian.deb10u3/rules
--- debian.deb10u2/rules 2022-07-28 18:16:54.000000000 +0200
+++ debian.deb10u3/rules 2022-08-04 09:49:04.000000000 +0200
@@ -73,7 +73,7 @@ update-version:
# README.Debian for more details of the cases described below.
#
PRECONFIGURE_CHECK = :
-HAVE_BINARY_TARBALL := $(shell ls -1 stage0/*/*$(DEB_HOST_RUST_TYPE)*
2>/dev/null | wc -l)
+HAVE_BINARY_TARBALL := $(shell ls -1 stage0*/*/*$(DEB_HOST_RUST_TYPE)*
2>/dev/null | wc -l)
DOWNLOAD_BOOTSTRAP := false
# allow not using the binary tarball although it exists
#ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 powerpc ppc64el
s390x))
@@ -193,6 +193,7 @@ build:
override_dh_clean:
# Upstream contains a lot of these
dh_clean -XCargo.toml.orig
+ rm -f stage0/*/*-mips-* stage0/*/*-mipsel-*
debian/config.toml: debian/config.toml.in debian/rules
u="$(DEB_VERSION_UPSTREAM)"; \
@@ -251,6 +252,12 @@ debian/dh_auto_configure.stamp: debian/c
echo 'fn main() { println!("cargo:rustc-link-lib=lzma"); }' >
vendor/lzma-sys/build.rs
# We don't run ./configure because we use debian/config.toml directly
ln -sf debian/config.toml config.toml
+ # set up links for the mips* tarballs, as bootstrap.py expects them in
stage0/
+ for fmips in stage0-mips/*/*; do \
+ f0="`echo $$fmips | sed 's/stage0-mips/stage0/'`"; \
+ # we use a hardlink here, for some reason bootstrap.py doesn't
like symlinks \
+ ln $$fmips $$f0; \
+ done
touch "$@"
override_dh_auto_configure-arch: debian/dh_auto_configure.stamp
