From: Alyssa Ross <hi@alyssa.is>
To: ~qaul/community@lists.sr.ht
Cc: Katharina Fey <kookie@spacekookie.de>,
	Alyssa Ross <hi@alyssa.is>
Subject: [PATCH 2/2] Fix libopus cross compilation error
Date: Mon,  1 Jun 2020 01:45:41 +0000
Message-Id: <20200601014541.23531-2-hi@alyssa.is>
In-Reply-To: <20200601014541.23531-1-hi@alyssa.is>
References: <20200601014541.23531-1-hi@alyssa.is>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

There were two separate issues causing the cross build to fail because
of libopus.  One was in cc[1], and the other in
opus-sys/opusic-sys[2].

I've sent PRs for both of those issues.  This patch adds Cargo
overrides to have those crates be built from my PR branches instead of
from crates.io.

[1]: https://github.com/alexcrichton/cc-rs/pull/507
[2]: https://github.com/DoumanAsh/opusic-sys/pull/1
---
 Cargo.lock | 9 +++++----
 Cargo.toml | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d7a58617..f7137dff 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -362,8 +362,7 @@ checksum =3D "b9fc62803d62905cdc62628699ef104177bab00=
250e24e37f70051b440f1d46e"
 [[package]]
 name =3D "cc"
 version =3D "1.0.54"
-source =3D "registry+https://github.com/rust-lang/crates.io-index"
-checksum =3D "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd25222=
0c8311"
+source =3D "git+https://github.com/alyssais/cc-rs?branch=3Dclang_path#94=
08c761b2a6d314233e2e4782546d8ab4a2cb2a"
=20
 [[package]]
 name =3D "cesu8"
@@ -1627,8 +1626,10 @@ checksum =3D "2839e79665f131bdb5782e51f2c6c9599c13=
3c6098982a54c794358bf432529c"
 [[package]]
 name =3D "opusic-sys"
 version =3D "0.2.2"
-source =3D "registry+https://github.com/rust-lang/crates.io-index"
-checksum =3D "23eea772b9bf5c4ca3e136764299b775f3f21d00997e7543f92cca82bc=
b49ff1"
+source =3D "git+https://github.com/alyssais/opusic-sys?branch=3Dcross#50=
cacf1e06b815cb251940b848602ee6a044b755"
+dependencies =3D [
+ "cc",
+]
=20
 [[package]]
 name =3D "parking_lot"
diff --git a/Cargo.toml b/Cargo.toml
index 98e7f448..4bbfb2b1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,3 +49,7 @@ members =3D [
     "clients/linux-cli",
     "clients/hubd",
 ]
+
+[patch.crates-io]
+opusic-sys =3D { git =3D "https://github.com/alyssais/opusic-sys", branc=
h =3D "cross" }
+cc =3D { git =3D "https://github.com/alyssais/cc-rs", branch =3D "clang_=
path" }
\ No newline at end of file
--=20
2.26.2