From 844efd76bfa505dde5817c3192e8a142d531d312 Mon Sep 17 00:00:00 2001 From: Johannes Date: Fri, 23 Nov 2018 19:19:08 +0100 Subject: [PATCH] rust: link against zlib and ncurses explicitly else, librustc_codegen_llvm-llvm.so doesn't get linked against them when cross compiling fixes https://github.com/void-linux/void-packages/issues/4379 [ci skip] --- srcpkgs/rust/patches/llvm-with-dependencies.patch | 13 +++++++++++++ srcpkgs/rust/patches/llvm-with-ffi.patch | 9 --------- 2 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/rust/patches/llvm-with-dependencies.patch delete mode 100644 srcpkgs/rust/patches/llvm-with-ffi.patch diff --git a/srcpkgs/rust/patches/llvm-with-dependencies.patch b/srcpkgs/rust/patches/llvm-with-dependencies.patch new file mode 100644 index 00000000000..01ee0ac0dac --- /dev/null +++ b/srcpkgs/rust/patches/llvm-with-dependencies.patch @@ -0,0 +1,13 @@ +--- rustc-1.30.0-src/src/librustc_llvm/lib.rs.orig ++++ rustc-1.30.0-src/src/librustc_llvm/lib.rs +@@ -121,3 +121,10 @@ + LLVMInitializeWebAssemblyTargetMC, + LLVMInitializeWebAssemblyAsmPrinter); + } ++ ++#[link(name = "ffi")] ++extern {} ++#[link(name = "z")] ++extern {} ++#[link(name = "ncursesw")] ++extern {} diff --git a/srcpkgs/rust/patches/llvm-with-ffi.patch b/srcpkgs/rust/patches/llvm-with-ffi.patch deleted file mode 100644 index f357317d9be..00000000000 --- a/srcpkgs/rust/patches/llvm-with-ffi.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- rustc-1.21.0-src/src/librustc_llvm/lib.rs.orig -+++ rustc-1.21.0-src/src/librustc_llvm/lib.rs -@@ -425,3 +425,6 @@ - } - } - } -+ -+#[link(name = "ffi")] -+extern {}