diff options
author | Sam James <sam@gentoo.org> | 2024-11-09 12:53:33 +0000 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2024-11-09 12:59:32 +0000 |
commit | fb6cd96657ff2b678b9568060648bea4e452ce52 (patch) | |
tree | 37f3d1199abb0199de33cb82ab01e23bba954f1b /net-libs/quiche | |
parent | app-crypt/libsecret: Handle crypto implementations in a more consistent way (diff) | |
download | gentoo-fb6cd96657ff2b678b9568060648bea4e452ce52.tar.gz gentoo-fb6cd96657ff2b678b9568060648bea4e452ce52.tar.bz2 gentoo-fb6cd96657ff2b678b9568060648bea4e452ce52.zip |
net-libs/quiche: fix phase definitions
Same as b673ae2f19d960de7afaaf77349822dfee2f91f5, a better fix for
this is planned later but let's get things working for now.
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-libs/quiche')
-rw-r--r-- | net-libs/quiche/quiche-0.22.0-r2.ebuild (renamed from net-libs/quiche/quiche-0.22.0-r1.ebuild) | 18 | ||||
-rw-r--r-- | net-libs/quiche/quiche-9999.ebuild | 20 |
2 files changed, 34 insertions, 4 deletions
diff --git a/net-libs/quiche/quiche-0.22.0-r1.ebuild b/net-libs/quiche/quiche-0.22.0-r2.ebuild index e0713e1e6bf9..a767d0b6925c 100644 --- a/net-libs/quiche/quiche-0.22.0-r1.ebuild +++ b/net-libs/quiche/quiche-0.22.0-r2.ebuild @@ -249,6 +249,10 @@ src_prepare() { multilib_copy_sources } +src_configure() { + multilib-minimal_src_configure +} + multilib_src_configure() { append-flags "-fPIC" local mycmakeargs=( @@ -258,13 +262,25 @@ multilib_src_configure() { BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure } +src_compile() { + multilib-minimal_src_compile +} + multilib_src_compile() { BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_compile bssl QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)" } +src_test() { + multilib-minimal_src_test +} + multilib_src_test() { - QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test --target="$(rust_abi)" + QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test --target="$(rust_abi)" +} + +src_install() { + multilib-minimal_src_install } multilib_src_install() { diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild index 675f686c72be..b01b0f1aace8 100644 --- a/net-libs/quiche/quiche-9999.ebuild +++ b/net-libs/quiche/quiche-9999.ebuild @@ -199,8 +199,6 @@ RUST_USEDEP='${MULTILIB_USEDEP}' inherit multilib-minimal cargo cmake flag-o-matic rust-toolchain -inherit cargo cmake flag-o-matic rust-toolchain multilib-minimal - DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3" HOMEPAGE="https://github.com/cloudflare/quiche" @@ -251,6 +249,10 @@ src_prepare() { multilib_copy_sources } +src_configure() { + multilib-minimal_src_configure +} + multilib_src_configure() { append-flags "-fPIC" local mycmakeargs=( @@ -260,13 +262,25 @@ multilib_src_configure() { BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure } +src_compile() { + multilib-minimal_src_compile +} + multilib_src_compile() { BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_compile bssl QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)" } +src_test() { + multilib-minimal_src_test +} + multilib_src_test() { - QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test --target="$(rust_abi)" + QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test --target="$(rust_abi)" +} + +src_install() { + multilib-minimal_src_install } multilib_src_install() { |