From 281acf551568db9d5fe62051b5d3b445f7ca38c9 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@gentoo.org>
Date: Fri, 29 Nov 2019 23:23:44 -0500
Subject: [PATCH] net-libs/quiche: Fix multilib

* Depend on multilib rust, doesn't support rust-bin, see:
  https://bugs.gentoo.org/701362
* Pass --target to cargo
* Build boringssl separately because cargo doesn't cross compile
  correctly, see:
  https://github.com/cloudflare/quiche/issues/277

Closes: https://bugs.gentoo.org/701346
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Craig Andrews <candrews@gentoo.org>
---
 net-libs/quiche/quiche-0.1.0-r1.ebuild | 203 +++++++++++++++++++++++++
 net-libs/quiche/quiche-9999.ebuild     |  25 ++-
 2 files changed, 222 insertions(+), 6 deletions(-)
 create mode 100644 net-libs/quiche/quiche-0.1.0-r1.ebuild

diff --git a/net-libs/quiche/quiche-0.1.0-r1.ebuild b/net-libs/quiche/quiche-0.1.0-r1.ebuild
new file mode 100644
index 0000000000000..53701ea9f1641
--- /dev/null
+++ b/net-libs/quiche/quiche-0.1.0-r1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.6
+arrayvec-0.4.11
+atty-0.2.13
+autocfg-0.1.6
+backtrace-0.3.38
+backtrace-sys-0.1.31
+bitflags-1.2.0
+bstr-0.2.8
+bumpalo-2.6.0
+byteorder-1.3.2
+cast-0.2.2
+cc-1.0.45
+cfg-if-0.1.10
+clap-2.33.0
+cmake-0.1.42
+criterion-0.3.0
+criterion-plot-0.4.0
+crossbeam-deque-0.7.1
+crossbeam-epoch-0.7.2
+crossbeam-queue-0.1.2
+crossbeam-utils-0.6.6
+csv-1.1.1
+csv-core-0.1.6
+docopt-1.1.0
+either-1.5.3
+env_logger-0.6.2
+failure-0.1.5
+failure_derive-0.1.5
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+getrandom-0.1.12
+heck-0.3.1
+humantime-1.3.0
+idna-0.1.5
+iovec-0.1.2
+itertools-0.8.0
+itoa-0.4.4
+js-sys-0.3.28
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libc-0.2.62
+log-0.4.8
+matches-0.1.8
+memchr-2.2.1
+memoffset-0.5.1
+mio-0.6.19
+miow-0.2.1
+net2-0.2.33
+nodrop-0.1.13
+nom-4.2.3
+num-traits-0.2.8
+num_cpus-1.10.1
+percent-encoding-1.0.1
+proc-macro2-0.4.30
+proc-macro2-1.0.4
+quick-error-1.2.2
+quote-0.6.13
+quote-1.0.2
+rand_core-0.5.1
+rand_os-0.2.2
+rand_xoshiro-0.3.1
+rayon-1.2.0
+rayon-core-1.6.0
+regex-1.3.1
+regex-automata-0.1.8
+regex-syntax-0.6.12
+ring-0.16.9
+rustc-demangle-0.1.16
+rustc_version-0.2.3
+ryu-1.0.0
+same-file-1.0.5
+scopeguard-1.0.0
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.101
+serde_derive-1.0.101
+serde_json-1.0.40
+slab-0.4.2
+smallvec-0.6.10
+sourcefile-0.1.4
+spin-0.5.2
+strsim-0.9.2
+syn-0.15.44
+syn-1.0.5
+synstructure-0.10.2
+termcolor-1.0.5
+textwrap-0.11.0
+thread_local-0.3.6
+tinytemplate-1.0.2
+unicode-bidi-0.3.4
+unicode-normalization-0.1.8
+unicode-segmentation-1.3.0
+unicode-width-0.1.6
+unicode-xid-0.1.0
+unicode-xid-0.2.0
+untrusted-0.7.0
+url-1.7.2
+version_check-0.1.5
+walkdir-2.2.9
+wasi-0.7.0
+wasm-bindgen-0.2.51
+wasm-bindgen-backend-0.2.51
+wasm-bindgen-macro-0.2.51
+wasm-bindgen-macro-support-0.2.51
+wasm-bindgen-shared-0.2.51
+wasm-bindgen-webidl-0.2.51
+web-sys-0.3.28
+weedle-0.10.0
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.2
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.2
+ws2_32-sys-0.2.1
+"
+
+inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain
+
+DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
+HOMEPAGE="https://github.com/cloudflare/quiche"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git"
+	inherit git-r3
+else
+	CRATES+=" ${P//_/-}"
+	SRC_URI="$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm64"
+	S="${WORKDIR}/${P//_/-}"
+fi
+
+LICENSE="|| ( Apache-2.0 Boost-1.0 )
+	|| ( Apache-2.0 MIT )
+	|| ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT )
+	BSD-2
+	BSD
+	ISC
+	MIT
+	|| ( Unlicense MIT )
+	openssl"
+SLOT="0/0"
+IUSE=""
+DOCS=( CODEOWNERS  COPYING README.md )
+
+BDEPEND="
+	>=dev-lang/rust-1.38.0[${MULTILIB_USEDEP}]
+	dev-util/cmake
+	dev-lang/go
+"
+DEPEND=""
+RDEPEND=""
+
+CMAKE_USE_DIR="${S}/deps/boringssl"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+		tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die
+	fi
+}
+
+src_prepare(){
+	default
+	cmake-utils_src_prepare
+	multilib_copy_sources
+}
+
+multilib_src_configure(){
+	append-flags "-fPIC"
+	local mycmakeargs=(
+		-DOPENSSL_NO_ASM=ON
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
+}
+
+multilib_src_compile(){
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features pkg-config-meta --target="$(rust_abi)"
+}
+
+multilib_src_test(){
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
+}
+
+multilib_src_install() {
+	sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/release/quiche.pc || die
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins target/release/quiche.pc
+	doheader -r include/*
+	dolib.so "target/$(rust_abi)/release/libquiche.so"
+}
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index 3fad3c0e9a34e..9c8f1748e8527 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -122,7 +122,7 @@ wincolor-1.0.2
 ws2_32-sys-0.2.1
 "
 
-inherit cargo multilib-minimal
+inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain
 
 DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
 HOMEPAGE="https://github.com/cloudflare/quiche"
@@ -133,7 +133,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	CRATES+=" ${P//_/-}"
 	SRC_URI="$(cargo_crate_uris ${CRATES})"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 	S="${WORKDIR}/${P//_/-}"
 fi
 
@@ -151,13 +151,15 @@ IUSE=""
 DOCS=( CODEOWNERS  COPYING README.md )
 
 BDEPEND="
-	>=virtual/rust-1.39.0
+	>=dev-lang/rust-1.38.0[${MULTILIB_USEDEP}]
 	dev-util/cmake
 	dev-lang/go
 "
 DEPEND=""
 RDEPEND=""
 
+CMAKE_USE_DIR="${S}/deps/boringssl"
+
 src_unpack() {
 	if [[ "${PV}" == *9999* ]]; then
 		git-r3_src_unpack
@@ -170,15 +172,26 @@ src_unpack() {
 
 src_prepare(){
 	default
+	cmake-utils_src_prepare
 	multilib_copy_sources
 }
 
+multilib_src_configure(){
+	append-flags "-fPIC"
+	local mycmakeargs=(
+		-DOPENSSL_NO_ASM=ON
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
+}
+
 multilib_src_compile(){
-	cargo_src_compile --features pkg-config-meta
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features pkg-config-meta --target="$(rust_abi)"
 }
 
 multilib_src_test(){
-	cargo_src_test
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
 }
 
 multilib_src_install() {
@@ -186,5 +199,5 @@ multilib_src_install() {
 	insinto "/usr/$(get_libdir)/pkgconfig"
 	doins target/release/quiche.pc
 	doheader -r include/*
-	dolib.so target/release/libquiche.so
+	dolib.so "target/$(rust_abi)/release/libquiche.so"
 }