commit: b1f91475b8b60821d8ed968dc1614a7b110c7811 Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Tue Sep 7 16:13:17 2021 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Tue Sep 7 16:13:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f91475
net-libs/quiche: migrate from 'cmake-utils' to 'cmake' Closes: https://bugs.gentoo.org/811954 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> net-libs/quiche/{quiche-9999.ebuild => quiche-0.9.0-r1.ebuild} | 10 +++++----- net-libs/quiche/quiche-9999.ebuild | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-0.9.0-r1.ebuild similarity index 94% copy from net-libs/quiche/quiche-9999.ebuild copy to net-libs/quiche/quiche-0.9.0-r1.ebuild index d2759feb7f7..e3b15c8690e 100644 --- a/net-libs/quiche/quiche-9999.ebuild +++ b/net-libs/quiche/quiche-0.9.0-r1.ebuild @@ -136,7 +136,7 @@ winapi-x86_64-pc-windows-gnu-0.4.0 ws2_32-sys-0.2.1 " -inherit cargo cmake-utils flag-o-matic multilib-minimal 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"; @@ -172,6 +172,7 @@ DEPEND="" RDEPEND="" CMAKE_USE_DIR="${S}/deps/boringssl" +BUILD_DIR="${WORKDIR}/${P}" src_unpack() { if [[ "${PV}" == *9999* ]]; then @@ -185,7 +186,7 @@ src_unpack() { src_prepare() { default - cmake-utils_src_prepare + cmake_src_prepare multilib_copy_sources } @@ -195,11 +196,11 @@ multilib_src_configure() { -DOPENSSL_NO_ASM=ON -DBUILD_SHARED_LIBS=OFF ) - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure + BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure } multilib_src_compile() { - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl + 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)" } @@ -215,5 +216,4 @@ multilib_src_install() { dolib.so "target/$(rust_abi)/release/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 d2759feb7f7..e3b15c8690e 100644 --- a/net-libs/quiche/quiche-9999.ebuild +++ b/net-libs/quiche/quiche-9999.ebuild @@ -136,7 +136,7 @@ winapi-x86_64-pc-windows-gnu-0.4.0 ws2_32-sys-0.2.1 " -inherit cargo cmake-utils flag-o-matic multilib-minimal 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"; @@ -172,6 +172,7 @@ DEPEND="" RDEPEND="" CMAKE_USE_DIR="${S}/deps/boringssl" +BUILD_DIR="${WORKDIR}/${P}" src_unpack() { if [[ "${PV}" == *9999* ]]; then @@ -185,7 +186,7 @@ src_unpack() { src_prepare() { default - cmake-utils_src_prepare + cmake_src_prepare multilib_copy_sources } @@ -195,11 +196,11 @@ multilib_src_configure() { -DOPENSSL_NO_ASM=ON -DBUILD_SHARED_LIBS=OFF ) - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure + BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure } multilib_src_compile() { - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl + 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)" } @@ -215,5 +216,4 @@ multilib_src_install() { dolib.so "target/$(rust_abi)/release/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 - }
