From daa1d0f079148b9341264c7890e572865643f88f Mon Sep 17 00:00:00 2001
From: Rasmus Thomsen <oss@cogitri.dev>
Date: Fri, 27 Sep 2019 22:46:02 +0200
Subject: community/rust: don't use system libgit2 for now

https://github.com/rust-lang/rust/issues/63476
---
 community/rust/APKBUILD | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'community/rust')

diff --git a/community/rust/APKBUILD b/community/rust/APKBUILD
index 3d5ede9e62..ee9063d6f5 100644
--- a/community/rust/APKBUILD
+++ b/community/rust/APKBUILD
@@ -7,7 +7,7 @@ pkgname=rust
 pkgver=1.38.0
 _llvmver=8
 _bootver=1.37.0
-pkgrel=0
+pkgrel=1
 pkgdesc="The Rust Programming Language"
 url="https://www.rust-lang.org"
 arch="x86_64 armv7 armhf aarch64 x86 ppc64le"
@@ -110,8 +110,10 @@ _sharedir="usr/share/rust"
 ldpath="/$_rlibdir"
 
 export RUST_BACKTRACE=1
+# Don't use system libgit2 for now...
+# https://github.com/rust-lang/rust/issues/63476
 # Convince libgit2-sys to use the distro libgit2.
-export LIBGIT2_SYS_USE_PKG_CONFIG=1
+#export LIBGIT2_SYS_USE_PKG_CONFIG=1
 
 # rust checksums files in vendor/, but we have to patch a few files...
 _clear_vendor_checksums() {
@@ -157,6 +159,10 @@ build() {
 		--set="target.$_build.musl-root=/usr" \
 		--set="target.$_build.crt-static=false"
 
+	# Allow warnings instead of just aborting the build
+	sed 's/#deny-warnings = .*/deny-warnings = false/' -i config.toml
+	sed 's|deny(warnings,|deny(|' -i src/bootstrap/lib.rs
+
 	./x.py build --jobs ${JOBS:-2}
 }
 
-- 
cgit v1.2.3