proxmox-mirrors/rustc
1
0
Fork 0
mirror of https://git.proxmox.com/git/rustc synced 2026-08-10 11:40:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disabling tidy appears not to work, so fix our patches to adhere it

Browse Source
This commit is contained in:
Ximin Luo 2017-02-26 18:09:14 +01:00
parent 3561015b93
commit 6a4eafbeee
4 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/patches/d-add-soname.patch vendored
View File

@ -22,11 +22,12 @@ Index: rustc.git/src/librustc_trans/back/link.rs
===================================================================
--- rustc.git.orig/src/librustc_trans/back/link.rs
+++ rustc.git/src/librustc_trans/back/link.rs
@@ -895,6 +895,12 @@ fn link_args(cmd: &mut Linker,
@@ -895,6 +895,13 @@ fn link_args(cmd: &mut Linker,
cmd.args(&rpath::get_rpath_flags(&mut rpath_config));
}
+ if (crate_type == config::CrateTypeDylib || crate_type == config::CrateTypeCdylib) && t.options.linker_is_gnu {
+ if (crate_type == config::CrateTypeDylib || crate_type == config::CrateTypeCdylib)
+ && t.options.linker_is_gnu {
+ let filename = String::from(out_filename.file_name().unwrap().to_str().unwrap());
+ let soname = [String::from("-Wl,-soname=") + &filename];
+ cmd.args(&soname);

4
debian/patches/d-dynamic-link-llvm.patch vendored
View File

@ -68,7 +68,7 @@ Index: rustc.git/src/librustc_llvm/build.rs
- }
+ // Link in all LLVM libraries
+ // Link in Debian full LLVM shared library.
+ // TODO: not sure what to do in the cross-compiling case.
+ // FIXME: not sure what to do in the cross-compiling case.
+ println!("cargo:rustc-link-lib={}={}", "dylib", "LLVM-3.9");
// LLVM ldflags
@ -115,7 +115,7 @@ Index: rustc.git/src/etc/mklldeps.py
- f.write(", kind = \"static\"")
- f.write(")]\n")
+# Link in Debian full LLVM shared library.
+# TODO: not sure what to do in the cross-compiling case.
+# FIXME: not sure what to do in the cross-compiling case.
+f.write("#[link(name = \"LLVM-3.9\")]\n")
+

2
debian/patches/series vendored
View File

@ -19,5 +19,5 @@ d-fix-configure-for-deb-arches.patch
d-dynamic-link-llvm.patch
d-use-system-jquery.patch
d-fill-in-mips-mk-rules.patch
disable-check-tool-tidy.diff
#disable-check-tool-tidy.diff
d-missing-ref-dlsym-ppc64el.patch

35
debian/patches/u-ignoretest-jemalloc.patch vendored
View File

@ -1,12 +1,12 @@
Description: Disable jemalloc tests and on s390x
Author: Ximin Luo <infinity0@debian.org>
Bug: https://github.com/rust-lang/rust/issues/38596
Bug: https://github.com/rust-lang/rust/issues/38612
Bug: https://github.com/rust-lang/rust/pull/38675
Applied-Upstream: commit:1a2ed98d344b6cbddc57db8841b42f935877e08d
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/librustc_back/target/s390x_unknown_linux_gnu.rs
+++ b/src/librustc_back/target/s390x_unknown_linux_gnu.rs
Index: rust/src/librustc_back/target/s390x_unknown_linux_gnu.rs
===================================================================
--- rust.orig/src/librustc_back/target/s390x_unknown_linux_gnu.rs 2017-02-26 18:08:22.891629489 +0100
+++ rust/src/librustc_back/target/s390x_unknown_linux_gnu.rs 2017-02-26 18:08:22.887629473 +0100
@@ -19,6 +19,8 @@
// Pass the -vector feature string to LLVM to respect this assumption.
base.features = "-vector".to_string();
@ -16,28 +16,35 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Ok(Target {
llvm_target: "s390x-unknown-linux-gnu".to_string(),
--- a/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs
+++ b/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs
@@ -29,9 +29,9 @@
Index: rust/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs
===================================================================
--- rust.orig/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs 2017-02-26 18:08:22.891629489 +0100
+++ rust/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs 2017-02-26 18:08:22.887629473 +0100
@@ -29,9 +29,11 @@
// ensure we get the same error.
//
// So long as we CI linux/OSX we should be good.
-#[cfg(any(target_os = "linux", target_os = "macos"))]
+#[cfg(any(all(target_os = "linux", not(any(target_arch = "aarch64", target_arch = "mips", target_arch = "mips64", target_arch = "powerpc", target_arch = "powerpc64", target_arch = "s390x"))), target_os = "macos"))]
+#[cfg(any(all(target_os = "linux", any(target_arch = "x86", target_arch = "x86_64")),
+ target_os = "macos"))]
extern crate alloc_system;
-#[cfg(not(any(target_os = "linux", target_os = "macos")))]
+#[cfg(not(any(all(target_os = "linux", not(any(target_arch = "aarch64", target_arch = "mips", target_arch = "mips64", target_arch = "powerpc", target_arch = "powerpc64", target_arch = "s390x"))), target_os = "macos")))]
+#[cfg(not(any(all(target_os = "linux", any(target_arch = "x86", target_arch = "x86_64")),
+ target_os = "macos")))]
extern crate allocator1;
fn main() {
--- a/src/test/run-pass/allocator-default.rs
+++ b/src/test/run-pass/allocator-default.rs
@@ -10,7 +10,7 @@
Index: rust/src/test/run-pass/allocator-default.rs
===================================================================
--- rust.orig/src/test/run-pass/allocator-default.rs 2017-02-26 18:08:22.891629489 +0100
+++ rust/src/test/run-pass/allocator-default.rs 2017-02-26 18:08:22.887629473 +0100
@@ -10,7 +10,8 @@
#![feature(alloc_jemalloc)]
-#[cfg(any(target_os = "linux", target_os = "macos"))]
+#[cfg(any(all(target_os = "linux", not(any(target_arch = "aarch64", target_arch = "mips", target_arch = "mips64", target_arch = "powerpc", target_arch = "powerpc64", target_arch = "s390x"))), target_os = "macos"))]
+#[cfg(any(all(target_os = "linux", any(target_arch = "x86", target_arch = "x86_64")),
+ target_os = "macos"))]
extern crate alloc_jemalloc;
fn main() {