[patch] patch against the cargo2.eclass

cargo2-cross.patch (text/plain), 2.84 KB, created by tt_1 on 2019-03-18 12:09:31 UTC

From ef8e15971f329d4b8645bf0771a960cb2f7ccb91 Mon Sep 17 00:00:00 2001
From: stefson <[e-mail]>
Date: Tue, 12 Mar 2019 13:21:47 +0100
Subject: [PATCH 1/4] cargo: reenable cargo build -v for debugging

---
 eclass/cargo.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index 051d5c499a6e..8e92cb862770 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -122,7 +122,7 @@ cargo_src_compile() {
 
 	export CARGO_HOME="${ECARGO_HOME}"
 
-	cargo build -j $(makeopts_jobs) $(usex debug "" --release) "$@" \
+	cargo build -v -j $(makeopts_jobs) $(usex debug "" --release) "$@" \
 		|| die "cargo build failed"
 }
 

From 3bd05bd5305c20b2c8b00c7b7b464f3f216d5add Mon Sep 17 00:00:00 2001
From: stefson <[e-mail]>
Date: Tue, 12 Mar 2019 13:22:19 +0100
Subject: [PATCH 2/4] cargo: set --target manually for cross compile

---
 eclass/cargo.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index 8e92cb862770..b4b5d86ffcb7 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -122,7 +122,7 @@ cargo_src_compile() {
 
 	export CARGO_HOME="${ECARGO_HOME}"
 
-	cargo build -v -j $(makeopts_jobs) $(usex debug "" --release) "$@" \
+	cargo build -v --target=armv7-unknown-linux-gnueabihf -j $(makeopts_jobs) $(usex debug "" --release) "$@" \
 		|| die "cargo build failed"
 }
 

From 62ffefd8906e42c9319b78b7fb6fb0bdfb27aab5 Mon Sep 17 00:00:00 2001
From: stefson <[e-mail]>
Date: Tue, 12 Mar 2019 13:22:56 +0100
Subject: [PATCH 3/4] cargo: set up correct linker for cross-compile

---
 eclass/cargo.eclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index b4b5d86ffcb7..73f0dcad9cda 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -111,6 +111,10 @@ cargo_gen_config() {
 	[source.crates-io]
 	replace-with = "gentoo"
 	local-registry = "/nonexistant"
+
+	[target.armv7-unknown-linux-gnueabihf]
+	linker = "armv7a-unknown-linux-gnueabihf-gcc"
+
 	EOF
 }
 

From 3fb7ee4d7667fd7931a2c6f094cc5e2f6531b363 Mon Sep 17 00:00:00 2001
From: stefson <[e-mail]>
Date: Tue, 12 Mar 2019 13:23:34 +0100
Subject: [PATCH 4/4] cargo: add cargo install --target

---
 eclass/cargo.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index 73f0dcad9cda..75e7f0cf388d 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -136,7 +136,7 @@ cargo_src_compile() {
 cargo_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	cargo install -j $(makeopts_jobs) --root="${D}/usr" $(usex debug --debug "") "$@" \
+	cargo install --target=armv7-unknown-linux-gnueabihf -j $(makeopts_jobs) --root="${D}/usr" $(usex debug --debug "") "$@" \
 		|| die "cargo install failed"
 	rm -f "${D}/usr/.crates.toml"