From d064fbef98ef372107dfc285b45d739cdbb6a258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 17 Feb 2025 13:23:42 +0100 Subject: [PATCH] build: make windows libstd build opt-in MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this is not really used in the archive, largely untested and breaks reproducibility. inverting the build profile and selection to make it easy for any third-party users to re-enable it in custom builds. Signed-off-by: Fabian Grünbichler --- debian/control | 7 +++---- debian/rules | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/control b/debian/control index 97d1623c11..5df9e149b5 100644 --- a/debian/control +++ b/debian/control @@ -18,8 +18,8 @@ Build-Depends: rustc:native (<= 1.85.0~beta.999++) , llvm-19-dev:native, llvm-19-tools:native, - gcc-mingw-w64-x86-64-posix:native [amd64] , - gcc-mingw-w64-i686-posix:native [i386] , + gcc-mingw-w64-x86-64-posix:native [amd64] , + gcc-mingw-w64-i686-posix:native [i386] , libllvm19 (>= 1:19.0.0), libclang-rt-19-dev:native, libclang-rt-19-dev, @@ -145,7 +145,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: gcc-mingw-w64-x86-64-posix [amd64], gcc-mingw-w64-i686-posix [i386], -Build-Profiles: +Build-Profiles: 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 @@ -403,7 +403,6 @@ Suggests: rust-doc (>= ${binary:Version}), rust-src (>= ${binary:Version}), libstd-rust-dev-wasm32 (>= ${binary:Version}), - libstd-rust-dev-windows (>= ${binary:Version}), Description: Rust systems programming language - all developer tools Rust is a curly-brace, block-structured expression language. It visually resembles the C language family, but differs significantly diff --git a/debian/rules b/debian/rules index 1e56ff8aec..7f8212bdf9 100755 --- a/debian/rules +++ b/debian/rules @@ -155,16 +155,16 @@ ifneq (,$(findstring nowasm,$(DEB_BUILD_PROFILES))) endif WINDOWS_SUPPORT := amd64 i386 -BUILD_WINDOWS := true -ifneq (,$(findstring nowindows,$(DEB_BUILD_PROFILES))) - BUILD_WINDOWS := false +BUILD_WINDOWS := false +ifneq (,$(findstring pkg.rustc.windows,$(DEB_BUILD_PROFILES))) + BUILD_WINDOWS := true endif ifeq (,$(filter $(DEB_HOST_ARCH), $(WINDOWS_SUPPORT))) BUILD_WINDOWS := false else ifeq (,$(filter $(DEB_BUILD_ARCH), $(WINDOWS_SUPPORT))) ifeq (true,$(BUILD_WINDOWS)) - $(error cannot cross-compile from $(DEB_BUILD_ARCH) to $(DEB_HOST_ARCH), unless "nowindows" is in DEB_BUILD_PROFILES) + $(error cannot cross-compile from $(DEB_BUILD_ARCH) to $(DEB_HOST_ARCH) with "pkg.rustc.windows" in DEB_BUILD_PROFILES) endif endif ifeq (i386,$(DEB_HOST_ARCH))