commit: cfb30a9304dac52c90bec9ff46eba3813b8ed57b Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sat Dec 20 15:54:39 2025 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Tue Dec 30 11:26:15 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfb30a93
net-libs/quiche: Simplify following cargo.eclass changes It is no longer necessary to pass --target for multilib, and doing so has disadvantages. Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> net-libs/quiche/quiche-0.24.6.ebuild | 12 ++++++------ net-libs/quiche/quiche-9999.ebuild | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/net-libs/quiche/quiche-0.24.6.ebuild b/net-libs/quiche/quiche-0.24.6.ebuild index c8e8d685d315..b0a8d5f3315d 100644 --- a/net-libs/quiche/quiche-0.24.6.ebuild +++ b/net-libs/quiche/quiche-0.24.6.ebuild @@ -260,7 +260,7 @@ [email protected] RUST_MULTILIB=1 -inherit cargo cmake flag-o-matic multilib-minimal rust-toolchain +inherit cargo cmake flag-o-matic multilib-minimal DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3" HOMEPAGE="https://github.com/cloudflare/quiche"; @@ -331,7 +331,7 @@ 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)" + QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" } src_test() { @@ -339,7 +339,7 @@ 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 } src_install() { @@ -347,11 +347,11 @@ src_install() { } multilib_src_install() { - sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/$(rust_abi)/release/quiche.pc || die + sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" "$(cargo_target_dir)"/quiche.pc || die insinto "/usr/$(get_libdir)/pkgconfig" - doins target/$(rust_abi)/release/quiche.pc + doins "$(cargo_target_dir)"/quiche.pc doheader -r include/* - dolib.so "target/$(rust_abi)/release/libquiche.so" + dolib.so "$(cargo_target_dir)"/libquiche.so QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165 } diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild index c8e8d685d315..b0a8d5f3315d 100644 --- a/net-libs/quiche/quiche-9999.ebuild +++ b/net-libs/quiche/quiche-9999.ebuild @@ -260,7 +260,7 @@ [email protected] RUST_MULTILIB=1 -inherit cargo cmake flag-o-matic multilib-minimal rust-toolchain +inherit cargo cmake flag-o-matic multilib-minimal DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3" HOMEPAGE="https://github.com/cloudflare/quiche"; @@ -331,7 +331,7 @@ 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)" + QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" } src_test() { @@ -339,7 +339,7 @@ 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 } src_install() { @@ -347,11 +347,11 @@ src_install() { } multilib_src_install() { - sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/$(rust_abi)/release/quiche.pc || die + sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" "$(cargo_target_dir)"/quiche.pc || die insinto "/usr/$(get_libdir)/pkgconfig" - doins target/$(rust_abi)/release/quiche.pc + doins "$(cargo_target_dir)"/quiche.pc doheader -r include/* - dolib.so "target/$(rust_abi)/release/libquiche.so" + dolib.so "$(cargo_target_dir)"/libquiche.so QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165 }
