Merge pull request #7 from sailfishos/jb50499-cross

Allow rust to cross-compile under scratchbox

Author: lbt

0001-Use-a-non-existent-test-path-instead-of-clobbering-d.patch

@@ -1,7 +1,7 @@
-From e9491f4aa3b1c2c0f9b1fdc684e986ba035a5486 Mon Sep 17 00:00:00 2001
+From cbdcd1136ceb6e2e4defcea0796b3b520fc35443 Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
 Date: Fri, 1 May 2020 16:50:10 -0700
-Subject: [PATCH 1/3] Use a non-existent test path instead of clobbering
+Subject: [PATCH 1/4] Use a non-existent test path instead of clobbering
  /dev/null
 
 Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
@@ -53,6 +53,8 @@ index f732abc52b7..edadecf273a 100644
 
  error: aborting due to previous error; 1 warning emitted
 
+
+base-commit: 49cae55760da0a43428eba73abcb659bb70cf2e4
 -- 
-2.26.2
+2.20.1
 

0002-Set-proper-llvm-targets.patch

@@ -1,7 +1,7 @@
-From 60d68652869d79e75d30c45ae8a7575bc2da6019 Mon Sep 17 00:00:00 2001
+From 72aaa3d28daa1b187059ef148c45bd9f186b430d Mon Sep 17 00:00:00 2001
 From: Matti Kosola <matti.kosola@jolla.com>
 Date: Thu, 9 Jul 2020 11:22:10 +0000
-Subject: [PATCH 2/3] Set proper llvm targets.
+Subject: [PATCH 2/4] Set proper llvm targets.
 
 Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
 ---
@@ -22,5 +22,5 @@ index 9121d1e1799..7990f01ab42 100644
  # LLVM experimental targets to build support for. These targets are specified in
  # the same format as above, but since these targets are experimental, they are
 -- 
-2.26.2
+2.20.1
 

0003-Disable-statx-for-all-builds.-JB-50106.patch

@@ -1,7 +1,7 @@
-From 191c6df3cfb0a3daae7ba40966ed22f8a63af453 Mon Sep 17 00:00:00 2001
+From f131514903bb02f5f9f1d312aea19e954ab1ffee Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Tomi=20Lepp=C3=A4nen?= <tomi.leppanen@jolla.com>
 Date: Fri, 26 Jun 2020 11:58:19 +0300
-Subject: [PATCH 3/3] Disable statx for all builds. JB#50106
+Subject: [PATCH 3/4] Disable statx for all builds. JB#50106
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -46,5 +46,5 @@ index a233aa47dff..45fb192fc8c 100644
 
  cfg_has_statx! {{
 -- 
-2.26.2
+2.20.1
 

0004-Scratchbox2-needs-to-be-able-to-tell-rustc-the-defau.patch

@@ -0,0 +1,38 @@
+From ee426fcbb8e03d1a7834c73225a65697b3dd4a1a Mon Sep 17 00:00:00 2001
+From: David Greaves <david.greaves@jolla.com>
+Date: Mon, 5 Oct 2020 10:14:39 +0100
+Subject: [PATCH 4/4] Scratchbox2 needs to be able to tell rustc the default
+ target.
+
+Currently this defaults to the target rust was built with. Rather than
+hardcode this for a cross-compiler, using an environment variable
+allows the same rustc binary to be used for all builds.
+
+Signed-off-by: David Greaves <david.greaves@jolla.com>
+---
+ src/librustc_session/config.rs | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/librustc_session/config.rs b/src/librustc_session/config.rs
+index 2513cfa73e5..529d836dc82 100644
+--- a/src/librustc_session/config.rs
++++ b/src/librustc_session/config.rs
+@@ -1363,7 +1363,14 @@ fn parse_target_triple(matches: &getopts::Matches, error_format: ErrorOutputType
+             })
+         }
+         Some(target) => TargetTriple::TargetTriple(target),
+-        _ => TargetTriple::from_triple(host_triple()),
++	// In SFOS we use SB2 and need to tell rust what the
++        // 'default' target is. If the SB2_RUST_TARGET_TRIPLE
++        // environment variable is set then it is used. Otherwise
++        // the fallback is the host_triple as usual
++        _ => match std::env::var("SB2_RUST_TARGET_TRIPLE") {
++            Ok(tgt) => TargetTriple::TargetTriple(tgt),
++            Err(_) => TargetTriple::from_triple(host_triple()),
++	}
+     }
+ }
+ 
+-- 
+2.20.1
+

0005-Cargo-Force-the-target-when-building-for-CompileKind-Host.patch

@@ -0,0 +1,29 @@
+From f58f4a0fb53df2b1b27c11986596c62de803afdf Mon Sep 17 00:00:00 2001
+From: David Greaves <david.greaves@jolla.com>
+Date: Mon, 30 Nov 2020 13:07:39 +0000
+Subject: [PATCH] Force the target when building for CompileKind::Host
+
+Currently hardwired to be i686-unknown-linux-gnu
+
+Signed-off-by: David Greaves <david.greaves@jolla.com>
+---
+ src/tools/cargo/src/cargo/core/compiler/mod.rs | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/tools/cargo/src/cargo/core/compiler/mod.rs b/src/tools/cargo/src/cargo/core/compiler/mod.rs
+index faee6e5..4af3f29 100644
+--- a/src/tools/cargo/src/cargo/core/compiler/mod.rs
++++ b/src/tools/cargo/src/cargo/core/compiler/mod.rs
+@@ -912,6 +912,9 @@ fn build_base_args<'a, 'cfg>(
+ 
+     if let CompileKind::Target(n) = unit.kind {
+         cmd.arg("--target").arg(n.rustc_target());
++    } else {
++	debug!("kind is {:?} - Forcing this to be 686", unit.kind);
++        cmd.arg("--target").arg("i686-unknown-linux-gnu");
+     }
+ 
+     opt(
+-- 
+2.20.1
+