Skip to content

Commit

Permalink
net/quiche: Update to 0.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
junhochoi authored and yzgyyang committed Feb 10, 2022
1 parent b269239 commit 5bd174a
Show file tree
Hide file tree
Showing 3 changed files with 134 additions and 168 deletions.
112 changes: 47 additions & 65 deletions net/quiche/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
PORTNAME= quiche
PORTVERSION= 0.10.0
PORTREVISION= 2
PORTVERSION= 0.12.0
CATEGORIES= net

MAINTAINER= junho.choi@gmail.com
Expand All @@ -11,100 +10,93 @@ LICENSE_FILE= ${WRKSRC}/COPYING

USES= cargo
USE_GITHUB= yes
USE_LDCONFIG= yes
GH_ACCOUNT= cloudflare
GH_TAGNAME= ${PORTVERSION}
GH_TUPLE= google:boringssl:f1c75347d:boringssl/deps/boringssl
GH_TUPLE= google:boringssl:f1c75347d:boringssl/quiche/deps/boringssl

CARGO_CRATES= aho-corasick-0.7.18 \
ansi_term-0.11.0 \
atty-0.2.14 \
autocfg-1.0.1 \
bindgen-0.57.0 \
autocfg-1.1.0 \
bindgen-0.59.2 \
bitflags-1.3.2 \
boring-sys-1.1.1 \
bumpalo-3.7.0 \
cc-1.0.70 \
cexpr-0.4.0 \
boring-sys-2.0.0 \
bumpalo-3.9.1 \
cc-1.0.72 \
cexpr-0.6.0 \
cfg-if-0.1.10 \
cfg-if-1.0.0 \
clang-sys-1.2.2 \
clap-2.33.3 \
cmake-0.1.45 \
darling-0.13.0 \
darling_core-0.13.0 \
darling_macro-0.13.0 \
clang-sys-1.3.1 \
cmake-0.1.48 \
darling-0.13.1 \
darling_core-0.13.1 \
darling_macro-0.13.1 \
docopt-1.1.1 \
env_logger-0.6.2 \
env_logger-0.8.4 \
fnv-1.0.7 \
fuchsia-zircon-0.3.3 \
fuchsia-zircon-sys-0.3.3 \
glob-0.3.0 \
hashbrown-0.11.2 \
hermit-abi-0.1.19 \
humantime-1.3.0 \
humantime-2.1.0 \
ident_case-1.0.1 \
idna-0.1.5 \
indexmap-1.7.0 \
indexmap-1.8.0 \
iovec-0.1.4 \
itoa-0.4.8 \
js-sys-0.3.54 \
itoa-1.0.1 \
js-sys-0.3.56 \
kernel32-sys-0.2.2 \
lazy_static-1.4.0 \
lazycell-1.3.0 \
libc-0.2.101 \
libloading-0.7.0 \
libm-0.2.1 \
libc-0.2.117 \
libloading-0.7.3 \
libm-0.2.2 \
log-0.4.14 \
matches-0.1.9 \
memchr-2.4.1 \
minimal-lexical-0.2.1 \
mio-0.6.23 \
miow-0.2.2 \
net2-0.2.37 \
nom-5.1.2 \
once_cell-1.8.0 \
nom-7.1.0 \
once_cell-1.9.0 \
peeking_take_while-0.1.2 \
percent-encoding-1.0.1 \
proc-macro2-1.0.29 \
proc-macro2-1.0.36 \
quick-error-1.2.3 \
quote-1.0.9 \
quote-1.0.15 \
regex-1.5.4 \
regex-syntax-0.6.25 \
ring-0.16.20 \
rustc-hash-1.1.0 \
rustversion-1.0.5 \
ryu-1.0.5 \
serde-1.0.130 \
serde_derive-1.0.130 \
serde_json-1.0.67 \
serde_with-1.10.0 \
serde_with_macros-1.5.0 \
shlex-0.1.1 \
slab-0.4.4 \
rustversion-1.0.6 \
ryu-1.0.9 \
serde-1.0.136 \
serde_derive-1.0.136 \
serde_json-1.0.78 \
serde_with-1.12.0 \
serde_with_macros-1.5.1 \
shlex-1.1.0 \
slab-0.4.5 \
spin-0.5.2 \
strsim-0.8.0 \
strsim-0.10.0 \
syn-1.0.76 \
syn-1.0.86 \
termcolor-1.1.2 \
textwrap-0.11.0 \
tinyvec-1.3.1 \
tinyvec-1.5.1 \
tinyvec_macros-0.1.0 \
unicode-bidi-0.3.6 \
unicode-bidi-0.3.7 \
unicode-normalization-0.1.19 \
unicode-width-0.1.8 \
unicode-xid-0.2.2 \
untrusted-0.7.1 \
url-1.7.2 \
vec_map-0.8.2 \
version_check-0.9.3 \
wasm-bindgen-0.2.77 \
wasm-bindgen-backend-0.2.77 \
wasm-bindgen-macro-0.2.77 \
wasm-bindgen-macro-support-0.2.77 \
wasm-bindgen-shared-0.2.77 \
web-sys-0.3.54 \
which-3.1.1 \
version_check-0.9.4 \
wasm-bindgen-0.2.79 \
wasm-bindgen-backend-0.2.79 \
wasm-bindgen-macro-0.2.79 \
wasm-bindgen-macro-support-0.2.79 \
wasm-bindgen-shared-0.2.79 \
web-sys-0.3.56 \
winapi-0.2.8 \
winapi-0.3.9 \
winapi-build-0.1.1 \
Expand All @@ -113,8 +105,6 @@ CARGO_CRATES= aho-corasick-0.7.18 \
winapi-x86_64-pc-windows-gnu-0.4.0 \
ws2_32-sys-0.2.1

CARGO_CARGOLOCK= ${QUICHEAPPS_CARGOLOCK}
CARGO_CARGOTOML= ${QUICHEAPPS_CARGOTOML}
CARGO_FEATURES= --no-default-features

PLIST_FILES= bin/quiche-client \
Expand All @@ -130,28 +120,20 @@ OPTIONS_DEFAULT=DOCS QLOG
QLOG_DESC= Enable qlog support
QLOG_VARS= CARGO_FEATURES+=qlog

LIBQUICHE_CARGOTOML= ${WRKSRC}/Cargo.toml
QUICHEAPPS_CARGOLOCK= ${WRKSRC}/tools/apps/Cargo.lock
QUICHEAPPS_CARGOTOML= ${WRKSRC}/tools/apps/Cargo.toml

post-patch:
@${GREP} -FRl -- '-D_XOPEN_SOURCE=700' ${WRKSRC}/deps/boringssl | \
@${GREP} -FRl -- '-D_XOPEN_SOURCE=700' ${WRKSRC}/quiche/deps/boringssl | \
${XARGS} ${REINPLACE_CMD} -e 's,-D_XOPEN_SOURCE=700,,'

# build libquiche and apps
do-build:
@${CARGO_CARGO_RUN} build \
--manifest-path ${LIBQUICHE_CARGOTOML} \
--verbose \
${CARGO_BUILD_ARGS}
@${CARGO_CARGO_RUN} build \
--manifest-path ${QUICHEAPPS_CARGOTOML} \
--verbose \
--workspace \
${CARGO_BUILD_ARGS}

# install quiche apps and libquiche
do-install:
${INSTALL_DATA} ${WRKSRC}/include/quiche.h ${STAGEDIR}${PREFIX}/include
${INSTALL_DATA} ${WRKSRC}/quiche/include/quiche.h ${STAGEDIR}${PREFIX}/include
${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/libquiche.so ${STAGEDIR}${PREFIX}/lib
${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/libquiche.a ${STAGEDIR}${PREFIX}/lib
${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/quiche-server ${STAGEDIR}${PREFIX}/bin
Expand Down
Loading

0 comments on commit 5bd174a

Please sign in to comment.