summaryrefslogtreecommitdiff
path: root/user/rust/0011-Add-missing-OpenSSL-configurations-for-musl-targets.patch
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2018-11-15 01:52:22 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2018-11-15 01:52:22 +0000
commit097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf (patch)
treedaa93c64489cab0512bad7c4e5f4b3b848bf7859 /user/rust/0011-Add-missing-OpenSSL-configurations-for-musl-targets.patch
parent950827890cca5caf633480047da6115f43b1a529 (diff)
parent18b490b7953735328501c6f7e54522a91220caf3 (diff)
downloadpackages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.gz
packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.bz2
packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.xz
packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.zip
Merge branch 'rust' into 'master'
user/rust: Bump to 1.30.1 See merge request !105
Diffstat (limited to 'user/rust/0011-Add-missing-OpenSSL-configurations-for-musl-targets.patch')
-rw-r--r--user/rust/0011-Add-missing-OpenSSL-configurations-for-musl-targets.patch59
1 files changed, 59 insertions, 0 deletions
diff --git a/user/rust/0011-Add-missing-OpenSSL-configurations-for-musl-targets.patch b/user/rust/0011-Add-missing-OpenSSL-configurations-for-musl-targets.patch
new file mode 100644
index 000000000..a010698ec
--- /dev/null
+++ b/user/rust/0011-Add-missing-OpenSSL-configurations-for-musl-targets.patch
@@ -0,0 +1,59 @@
+From 4affbaecfc9706253ce31e0008ad42dcd7f35a29 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Mon, 11 Sep 2017 11:21:56 -0500
+Subject: [PATCH 11/24] Add missing OpenSSL configurations for musl targets
+
+---
+ src/bootstrap/native.rs | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
+index 424264647f..a0329910be 100644
+--- a/src/bootstrap/native.rs
++++ b/src/bootstrap/native.rs
+@@ -643,9 +643,13 @@ impl Step for Openssl {
+ "arm-linux-androideabi" => "android",
+ "arm-unknown-linux-gnueabi" => "linux-armv4",
+ "arm-unknown-linux-gnueabihf" => "linux-armv4",
++ "arm-unknown-linux-musleabi" => "linux-armv4",
++ "arm-unknown-linux-musleabihf" => "linux-armv4",
++ "armv5te-unknown-linux-musleabi" => "linux-armv4",
+ "armv6-unknown-netbsd-eabihf" => "BSD-generic32",
+ "armv7-linux-androideabi" => "android-armv7",
+ "armv7-unknown-linux-gnueabihf" => "linux-armv4",
++ "armv7-unknown-linux-musleabihf" => "linux-armv4",
+ "armv7-unknown-netbsd-eabihf" => "BSD-generic32",
+ "i586-unknown-linux-gnu" => "linux-elf",
+ "i586-unknown-linux-musl" => "linux-elf",
+@@ -656,13 +660,17 @@ impl Step for Openssl {
+ "i686-unknown-linux-musl" => "linux-elf",
+ "i686-unknown-netbsd" => "BSD-x86-elf",
+ "mips-unknown-linux-gnu" => "linux-mips32",
++ "mips-unknown-linux-musl" => "linux-mips32",
+ "mips64-unknown-linux-gnuabi64" => "linux64-mips64",
+ "mips64el-unknown-linux-gnuabi64" => "linux64-mips64",
+ "mipsel-unknown-linux-gnu" => "linux-mips32",
++ "mipsel-unknown-linux-musl" => "linux-mips32",
+ "powerpc-unknown-linux-gnu" => "linux-ppc",
+ "powerpc-unknown-linux-gnuspe" => "linux-ppc",
++ "powerpc-unknown-linux-musl" => "linux-ppc",
+ "powerpc-unknown-netbsd" => "BSD-generic32",
+ "powerpc64-unknown-linux-gnu" => "linux-ppc64",
++ "powerpc64-unknown-linux-musl" => "linux-ppc64",
+ "powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
+ "powerpc64le-unknown-linux-musl" => "linux-ppc64le",
+ "s390x-unknown-linux-gnu" => "linux64-s390x",
+@@ -690,6 +698,10 @@ impl Step for Openssl {
+ configure.arg("-mandroid");
+ configure.arg("-fomit-frame-pointer");
+ }
++ // OpenSSL ships incompatible ELFv1 ABI assembly code
++ if target == "powerpc64-unknown-linux-musl" {
++ configure.arg("no-asm");
++ }
+ if target == "sparc64-unknown-netbsd" {
+ // Need -m64 to get assembly generated correctly for sparc64.
+ configure.arg("-m64");
+--
+2.18.0
+