Bug#1014907: buster-pu: package rustc-mozilla/1.59.0+dfsg1-1~deb10u1
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-Cc: pkg-rust-maintainers@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.
Cheers,
Emilio
diff -ruNp rustc-mozilla-1.59.0+dfsg1/debian/changelog buster/rustc-mozilla-1.59.0+dfsg1/debian/changelog
--- rustc-mozilla-1.59.0+dfsg1/debian/changelog 2022-07-03 11:51:30.000000000 +0200
+++ buster/rustc-mozilla-1.59.0+dfsg1/debian/changelog 2022-07-12 00:18:55.000000000 +0200
@@ -1,3 +1,12 @@
+rustc-mozilla (1.59.0+dfsg1-1~deb10u1) buster; urgency=medium
+
+ * Backport to buster.
+ * Lower debhelper compat to 12. Stop using env variables in debhelper
+ install files.
+ * Disable windows target.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Tue, 12 Jul 2022 00:18:55 +0200
+
rustc-mozilla (1.59.0+dfsg1-1~deb11u1) bullseye; urgency=medium
* Non-maintainer upload.
diff -ruNp rustc-mozilla-1.59.0+dfsg1/debian/control buster/rustc-mozilla-1.59.0+dfsg1/debian/control
--- rustc-mozilla-1.59.0+dfsg1/debian/control 2022-06-17 17:51:59.000000000 +0200
+++ buster/rustc-mozilla-1.59.0+dfsg1/debian/control 2022-07-11 16:52:06.000000000 +0200
@@ -9,7 +9,7 @@ Rules-Requires-Root: no
# :native annotations are to support cross-compiling, see README.Debian
Build-Depends:
debhelper (>= 9),
- debhelper-compat (= 13),
+ debhelper-compat (= 12),
dpkg-dev (>= 1.17.14),
python3:native,
# cargo:native (>= 0.40.0) <!pkg.rustc.dlstage0>,
@@ -17,8 +17,8 @@ Build-Depends:
# rustc:native (<= 1.59.0++) <!pkg.rustc.dlstage0>,
llvm-13-dev:native,
llvm-13-tools:native,
- gcc-mingw-w64-x86-64-posix:native [amd64] <!nowindows>,
- gcc-mingw-w64-i686-posix:native [i386] <!nowindows>,
+# gcc-mingw-w64-x86-64-posix:native [amd64] <!nowindows>,
+# gcc-mingw-w64-i686-posix:native [i386] <!nowindows>,
libllvm13 (>= 1:13.0.0),
cmake (>= 3.0) | cmake3,
# needed by some vendor crates
@@ -123,34 +123,34 @@ Description: Rust standard libraries - d
needed to compile Rust programs. It may also be installed on a system
of another host architecture, for cross-compiling to this architecture.
-Package: libstd-rust-mozilla-dev-windows
-Section: libdevel
-Architecture: amd64 i386
-Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends:
- gcc-mingw-w64-x86-64-posix [amd64],
- gcc-mingw-w64-i686-posix [i386],
-Conflicts: libstd-rust-dev-windows
-Replaces: libstd-rust-dev-windows
-Build-Profiles: <!nowindows>
-Description: Rust standard libraries - development files
- Rust is a curly-brace, block-structured expression language. It
- visually resembles the C language family, but differs significantly
- in syntactic and semantic details. Its design is oriented toward
- concerns of "programming in the large", that is, of creating and
- maintaining boundaries - both abstract and operational - that
- preserve large-system integrity, availability and concurrency.
- .
- It supports a mixture of imperative procedural, concurrent actor,
- object-oriented and pure functional styles. Rust also supports
- generic programming and meta-programming, in both static and dynamic
- styles.
- .
- This package contains the standard Rust libraries including development files,
- needed to cross-compile Rust programs to the *-pc-windows-gnu target
- corresponding to the architecture of this package.
-
+#Package: libstd-rust-mozilla-dev-windows
+#Section: libdevel
+#Architecture: amd64 i386
+#Multi-Arch: same
+#Depends: ${shlibs:Depends}, ${misc:Depends}
+#Recommends:
+# gcc-mingw-w64-x86-64-posix [amd64],
+# gcc-mingw-w64-i686-posix [i386],
+#Conflicts: libstd-rust-dev-windows
+#Replaces: libstd-rust-dev-windows
+#Build-Profiles: <!nowindows>
+#Description: Rust standard libraries - development files
+# Rust is a curly-brace, block-structured expression language. It
+# visually resembles the C language family, but differs significantly
+# in syntactic and semantic details. Its design is oriented toward
+# concerns of "programming in the large", that is, of creating and
+# maintaining boundaries - both abstract and operational - that
+# preserve large-system integrity, availability and concurrency.
+# .
+# It supports a mixture of imperative procedural, concurrent actor,
+# object-oriented and pure functional styles. Rust also supports
+# generic programming and meta-programming, in both static and dynamic
+# styles.
+# .
+# This package contains the standard Rust libraries including development files,
+# needed to cross-compile Rust programs to the *-pc-windows-gnu target
+# corresponding to the architecture of this package.
+#
#Package: libstd-rust-mozilla-dev-wasm32
#Section: libdevel
#Architecture: all
diff -ruNp rustc-mozilla-1.59.0+dfsg1/debian/libstd-rust-mozilla-1.59.install buster/rustc-mozilla-1.59.0+dfsg1/debian/libstd-rust-mozilla-1.59.install
--- rustc-mozilla-1.59.0+dfsg1/debian/libstd-rust-mozilla-1.59.install 2022-03-29 15:17:23.000000000 +0200
+++ buster/rustc-mozilla-1.59.0+dfsg1/debian/libstd-rust-mozilla-1.59.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/
diff -ruNp rustc-mozilla-1.59.0+dfsg1/debian/libstd-rust-mozilla-dev.install buster/rustc-mozilla-1.59.0+dfsg1/debian/libstd-rust-mozilla-dev.install
--- rustc-mozilla-1.59.0+dfsg1/debian/libstd-rust-mozilla-dev.install 2021-10-22 22:31:00.000000000 +0200
+++ buster/rustc-mozilla-1.59.0+dfsg1/debian/libstd-rust-mozilla-dev.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/lib/
diff -ruNp rustc-mozilla-1.59.0+dfsg1/debian/libstd-rust-mozilla-dev-windows.install buster/rustc-mozilla-1.59.0+dfsg1/debian/libstd-rust-mozilla-dev-windows.install
--- rustc-mozilla-1.59.0+dfsg1/debian/libstd-rust-mozilla-dev-windows.install 2021-10-22 22:34:38.000000000 +0200
+++ buster/rustc-mozilla-1.59.0+dfsg1/debian/libstd-rust-mozilla-dev-windows.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/rustlib/${env:WINDOWS_ARCH}-pc-windows-gnu/lib/
diff -ruNp rustc-mozilla-1.59.0+dfsg1/debian/rules buster/rustc-mozilla-1.59.0+dfsg1/debian/rules
--- rustc-mozilla-1.59.0+dfsg1/debian/rules 2022-06-18 11:55:15.000000000 +0200
+++ buster/rustc-mozilla-1.59.0+dfsg1/debian/rules 2022-07-12 00:18:55.000000000 +0200
@@ -123,7 +123,7 @@ ifneq (,$(findstring nowasm,$(DEB_BUILD_
endif
WINDOWS_SUPPORT := amd64 i386
-BUILD_WINDOWS := true
+BUILD_WINDOWS := false
ifneq (,$(findstring nowindows,$(DEB_BUILD_PROFILES)))
BUILD_WINDOWS := false
endif
@@ -210,6 +210,16 @@ ifneq (,$(filter $(DEB_BUILD_ARCH), armh
sed -i -e 's/^debuginfo-level = .*/debuginfo-level = 0/g' "$@"
endif
+debian/rustc-mozilla.%: debian/rustc-mozilla.%.in
+ m4 -DRUST_LONG_VERSION="$(RUST_LONG_VERSION)" \
+ -DDEB_HOST_RUST_TYPE="$(DEB_HOST_RUST_TYPE)" \
+ -DDEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
+ "$<" > "$@"
+
+debian/rust-mozilla-src.%: debian/rust-mozilla-src.%.in
+ m4 -DRUST_LONG_VERSION="$(RUST_LONG_VERSION)" \
+ "$<" > "$@"
+
check-no-old-llvm:
# fail the build if we have any instances of OLD_LLVM_VERSION in debian, except for debian/changelog
! grep --color=always -i '\(clang\|ll\(..\|d\)\)-\?$(subst .,\.,$(OLD_LLVM_VERSION))' --exclude=changelog --exclude=copyright --exclude='*.patch' --exclude-dir='.debhelper' -R debian
@@ -245,6 +255,8 @@ endif
override_dh_auto_clean:
$(RM) -rf build tmp .cargo debian/cargo_home config.stamp config.mk Makefile
$(RM) -rf $(TEST_LOG) debian/config.toml debian/*.stamp
+ $(RM) -rf debian/rust-mozilla-src.install debian/rust-mozilla-src.links
+ $(RM) -rf debian/rustc-mozilla.links
$(RM) -rf $(SRC_CLEAN) config.toml
debian/dh_auto_build.stamp:
@@ -396,7 +408,15 @@ ifeq (true,$(BUILD_DOCS))
find $(DEB_DESTDIR) \( -iname '*.html' -empty -o -name .lock -o -name '*.inc' \) -delete;
endif
-override_dh_install-indep:
+override_dh_install-arch: debian/rustc-mozilla.links
+ dh_install
+ dh_install -p$(LIBSTD_PKG) usr/lib/$(DEB_HOST_MULTIARCH)/
+ dh_install -plibstd-rust-mozilla-dev usr/lib/rustlib/$(DEB_HOST_RUST_TYPE)/lib/
+ifeq (true,$(BUILD_WINDOWS))
+ dh_install -plibstd-rust-dev-windows usr/lib/rustlib/$(WINDOWS_ARCH)-pc-windows-gnu/lib/
+endif
+
+override_dh_install-indep: debian/rust-mozilla-src.install debian/rust-mozilla-src.links
dh_install
$(RM) -rf $(SRC_CLEAN:%=debian/rust-mozilla-src/usr/src/rustc-$(RUST_LONG_VERSION)/%)
# Get rid of lintian warnings
diff -ruNp rustc-mozilla-1.59.0+dfsg1/debian/rustc-mozilla.links buster/rustc-mozilla-1.59.0+dfsg1/debian/rustc-mozilla.links
--- rustc-mozilla-1.59.0+dfsg1/debian/rustc-mozilla.links 2021-10-22 22:30:31.000000000 +0200
+++ buster/rustc-mozilla-1.59.0+dfsg1/debian/rustc-mozilla.links 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-usr/bin/lld-13 usr/bin/rust-lld
-usr/bin/clang-13 usr/bin/rust-clang
-usr/bin/llvm-dwp-13 usr/bin/rust-llvm-dwp
-# for -Z gcc-ld=lld, see compiler/rustc_codegen_ssa/src/back/link.rs for logic
-usr/bin/rust-lld usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/gcc-ld/ld
-usr/bin/rust-lld usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/gcc-ld/ld64
diff -ruNp rustc-mozilla-1.59.0+dfsg1/debian/rustc-mozilla.links.in buster/rustc-mozilla-1.59.0+dfsg1/debian/rustc-mozilla.links.in
--- rustc-mozilla-1.59.0+dfsg1/debian/rustc-mozilla.links.in 1970-01-01 01:00:00.000000000 +0100
+++ buster/rustc-mozilla-1.59.0+dfsg1/debian/rustc-mozilla.links.in 2022-07-12 00:15:05.000000000 +0200
@@ -0,0 +1,6 @@
+usr/bin/lld-13 usr/bin/rust-lld
+usr/bin/clang-13 usr/bin/rust-clang
+usr/bin/llvm-dwp-13 usr/bin/rust-llvm-dwp
+# for -Z gcc-ld=lld, see compiler/rustc_codegen_ssa/src/back/link.rs for logic
+usr/bin/rust-lld usr/lib/rustlib/DEB_HOST_RUST_TYPE/bin/gcc-ld/ld
+usr/bin/rust-lld usr/lib/rustlib/DEB_HOST_RUST_TYPE/bin/gcc-ld/ld64
diff -ruNp rustc-mozilla-1.59.0+dfsg1/debian/rust-mozilla-src.install buster/rustc-mozilla-1.59.0+dfsg1/debian/rust-mozilla-src.install
--- rustc-mozilla-1.59.0+dfsg1/debian/rust-mozilla-src.install 2021-10-22 22:52:20.000000000 +0200
+++ buster/rustc-mozilla-1.59.0+dfsg1/debian/rust-mozilla-src.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-debian/patches usr/src/rustc-${env:RUST_LONG_VERSION}/debian
-# from src/bootstrap/dist.rs:370 onwards
-COPYRIGHT usr/src/rustc-${env:RUST_LONG_VERSION}
-LICENSE-APACHE usr/src/rustc-${env:RUST_LONG_VERSION}
-LICENSE-MIT usr/src/rustc-${env:RUST_LONG_VERSION}
-CONTRIBUTING.md usr/src/rustc-${env:RUST_LONG_VERSION}
-README.md usr/src/rustc-${env:RUST_LONG_VERSION}
-RELEASES.md usr/src/rustc-${env:RUST_LONG_VERSION}
-configure usr/src/rustc-${env:RUST_LONG_VERSION}
-x.py usr/src/rustc-${env:RUST_LONG_VERSION}
-config.toml.example usr/src/rustc-${env:RUST_LONG_VERSION}
-Cargo.toml usr/src/rustc-${env:RUST_LONG_VERSION}
-src usr/src/rustc-${env:RUST_LONG_VERSION}
-library usr/src/rustc-${env:RUST_LONG_VERSION}
-compiler usr/src/rustc-${env:RUST_LONG_VERSION}
diff -ruNp rustc-mozilla-1.59.0+dfsg1/debian/rust-mozilla-src.install.in buster/rustc-mozilla-1.59.0+dfsg1/debian/rust-mozilla-src.install.in
--- rustc-mozilla-1.59.0+dfsg1/debian/rust-mozilla-src.install.in 1970-01-01 01:00:00.000000000 +0100
+++ buster/rustc-mozilla-1.59.0+dfsg1/debian/rust-mozilla-src.install.in 2022-07-12 00:10:45.000000000 +0200
@@ -0,0 +1,15 @@
+debian/patches usr/src/rustc-RUST_LONG_VERSION/debian
+# from src/bootstrap/dist.rs:370 onwards
+COPYRIGHT usr/src/rustc-RUST_LONG_VERSION
+LICENSE-APACHE usr/src/rustc-RUST_LONG_VERSION
+LICENSE-MIT usr/src/rustc-RUST_LONG_VERSION
+CONTRIBUTING.md usr/src/rustc-RUST_LONG_VERSION
+README.md usr/src/rustc-RUST_LONG_VERSION
+RELEASES.md usr/src/rustc-RUST_LONG_VERSION
+configure usr/src/rustc-RUST_LONG_VERSION
+x.py usr/src/rustc-RUST_LONG_VERSION
+config.toml.example usr/src/rustc-RUST_LONG_VERSION
+Cargo.toml usr/src/rustc-RUST_LONG_VERSION
+src usr/src/rustc-RUST_LONG_VERSION
+library usr/src/rustc-RUST_LONG_VERSION
+compiler usr/src/rustc-RUST_LONG_VERSION
diff -ruNp rustc-mozilla-1.59.0+dfsg1/debian/rust-mozilla-src.links buster/rustc-mozilla-1.59.0+dfsg1/debian/rust-mozilla-src.links
--- rustc-mozilla-1.59.0+dfsg1/debian/rust-mozilla-src.links 2021-10-22 22:52:20.000000000 +0200
+++ buster/rustc-mozilla-1.59.0+dfsg1/debian/rust-mozilla-src.links 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/src/rustc-${env:RUST_LONG_VERSION} usr/lib/rustlib/src/rust
diff -ruNp rustc-mozilla-1.59.0+dfsg1/debian/rust-mozilla-src.links.in buster/rustc-mozilla-1.59.0+dfsg1/debian/rust-mozilla-src.links.in
--- rustc-mozilla-1.59.0+dfsg1/debian/rust-mozilla-src.links.in 1970-01-01 01:00:00.000000000 +0100
+++ buster/rustc-mozilla-1.59.0+dfsg1/debian/rust-mozilla-src.links.in 2022-07-12 00:11:34.000000000 +0200
@@ -0,0 +1 @@
+usr/src/rustc-RUST_LONG_VERSION usr/lib/rustlib/src/rust
Reply to: