From: Alyssa Ross <hi@alyssa.is>
To: ~qaul/community@lists.sr.ht
Cc: Katharina Fey <kookie@spacekookie.de>
Subject: [PATCH v3 2/3] Fix libopus cross compilation error
Date: Mon, 15 Jun 2020 14:29:01 +0000
Message-Id: <20200615142902.6921-2-hi@alyssa.is>
In-Reply-To: <20200615142902.6921-1-hi@alyssa.is>
References: <20200601014541.23531-1-hi@alyssa.is>
 <20200615142902.6921-1-hi@alyssa.is>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

cc wasn't detecting the Android toolchain properly, causing a build
failure.  I sent a PR with the fix[1], which has been merged, but not
yet been released.

[1]: https://github.com/alexcrichton/cc-rs/pull/507
---
v2 of this patch also patched opusic-sys, but that's no longer=20
necessary since the latest version of magnum-opus supports a fixed
version of opusic-sys.  So now we only need the cc from git.

 Cargo.lock | 3 +--
 Cargo.toml | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 943a5142..820732cf 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/alexcrichton/cc-rs#78596975e2366665e7=
d44afe81ce4e3d2fc11147"
=20
 [[package]]
 name =3D "cesu8"
diff --git a/Cargo.toml b/Cargo.toml
index 98e7f448..ab30cd11 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,3 +49,6 @@ members =3D [
     "clients/linux-cli",
     "clients/hubd",
 ]
+
+[patch.crates-io]
+cc =3D { git =3D "https://github.com/alexcrichton/cc-rs" }
--=20
2.26.2