| 1 |
commit: b1f91475b8b60821d8ed968dc1614a7b110c7811 |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 7 16:13:17 2021 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 7 16:13:37 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f91475 |
| 7 |
|
| 8 |
net-libs/quiche: migrate from 'cmake-utils' to 'cmake' |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/811954 |
| 11 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
| 12 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 13 |
|
| 14 |
net-libs/quiche/{quiche-9999.ebuild => quiche-0.9.0-r1.ebuild} | 10 +++++----- |
| 15 |
net-libs/quiche/quiche-9999.ebuild | 10 +++++----- |
| 16 |
2 files changed, 10 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-0.9.0-r1.ebuild |
| 19 |
similarity index 94% |
| 20 |
copy from net-libs/quiche/quiche-9999.ebuild |
| 21 |
copy to net-libs/quiche/quiche-0.9.0-r1.ebuild |
| 22 |
index d2759feb7f7..e3b15c8690e 100644 |
| 23 |
--- a/net-libs/quiche/quiche-9999.ebuild |
| 24 |
+++ b/net-libs/quiche/quiche-0.9.0-r1.ebuild |
| 25 |
@@ -136,7 +136,7 @@ winapi-x86_64-pc-windows-gnu-0.4.0 |
| 26 |
ws2_32-sys-0.2.1 |
| 27 |
" |
| 28 |
|
| 29 |
-inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain |
| 30 |
+inherit cargo cmake flag-o-matic rust-toolchain multilib-minimal |
| 31 |
|
| 32 |
DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3" |
| 33 |
HOMEPAGE="https://github.com/cloudflare/quiche" |
| 34 |
@@ -172,6 +172,7 @@ DEPEND="" |
| 35 |
RDEPEND="" |
| 36 |
|
| 37 |
CMAKE_USE_DIR="${S}/deps/boringssl" |
| 38 |
+BUILD_DIR="${WORKDIR}/${P}" |
| 39 |
|
| 40 |
src_unpack() { |
| 41 |
if [[ "${PV}" == *9999* ]]; then |
| 42 |
@@ -185,7 +186,7 @@ src_unpack() { |
| 43 |
|
| 44 |
src_prepare() { |
| 45 |
default |
| 46 |
- cmake-utils_src_prepare |
| 47 |
+ cmake_src_prepare |
| 48 |
multilib_copy_sources |
| 49 |
} |
| 50 |
|
| 51 |
@@ -195,11 +196,11 @@ multilib_src_configure() { |
| 52 |
-DOPENSSL_NO_ASM=ON |
| 53 |
-DBUILD_SHARED_LIBS=OFF |
| 54 |
) |
| 55 |
- BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure |
| 56 |
+ BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure |
| 57 |
} |
| 58 |
|
| 59 |
multilib_src_compile() { |
| 60 |
- BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl |
| 61 |
+ BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_compile bssl |
| 62 |
QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)" |
| 63 |
} |
| 64 |
|
| 65 |
@@ -215,5 +216,4 @@ multilib_src_install() { |
| 66 |
dolib.so "target/$(rust_abi)/release/libquiche.so" |
| 67 |
QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS |
| 68 |
QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165 |
| 69 |
- |
| 70 |
} |
| 71 |
|
| 72 |
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild |
| 73 |
index d2759feb7f7..e3b15c8690e 100644 |
| 74 |
--- a/net-libs/quiche/quiche-9999.ebuild |
| 75 |
+++ b/net-libs/quiche/quiche-9999.ebuild |
| 76 |
@@ -136,7 +136,7 @@ winapi-x86_64-pc-windows-gnu-0.4.0 |
| 77 |
ws2_32-sys-0.2.1 |
| 78 |
" |
| 79 |
|
| 80 |
-inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain |
| 81 |
+inherit cargo cmake flag-o-matic rust-toolchain multilib-minimal |
| 82 |
|
| 83 |
DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3" |
| 84 |
HOMEPAGE="https://github.com/cloudflare/quiche" |
| 85 |
@@ -172,6 +172,7 @@ DEPEND="" |
| 86 |
RDEPEND="" |
| 87 |
|
| 88 |
CMAKE_USE_DIR="${S}/deps/boringssl" |
| 89 |
+BUILD_DIR="${WORKDIR}/${P}" |
| 90 |
|
| 91 |
src_unpack() { |
| 92 |
if [[ "${PV}" == *9999* ]]; then |
| 93 |
@@ -185,7 +186,7 @@ src_unpack() { |
| 94 |
|
| 95 |
src_prepare() { |
| 96 |
default |
| 97 |
- cmake-utils_src_prepare |
| 98 |
+ cmake_src_prepare |
| 99 |
multilib_copy_sources |
| 100 |
} |
| 101 |
|
| 102 |
@@ -195,11 +196,11 @@ multilib_src_configure() { |
| 103 |
-DOPENSSL_NO_ASM=ON |
| 104 |
-DBUILD_SHARED_LIBS=OFF |
| 105 |
) |
| 106 |
- BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure |
| 107 |
+ BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure |
| 108 |
} |
| 109 |
|
| 110 |
multilib_src_compile() { |
| 111 |
- BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl |
| 112 |
+ BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_compile bssl |
| 113 |
QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)" |
| 114 |
} |
| 115 |
|
| 116 |
@@ -215,5 +216,4 @@ multilib_src_install() { |
| 117 |
dolib.so "target/$(rust_abi)/release/libquiche.so" |
| 118 |
QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS |
| 119 |
QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165 |
| 120 |
- |
| 121 |
} |
Archives