nghttp2/nghttp2
1
0
Fork 0
mirror of https://github.com/nghttp2/nghttp2.git synced 2025-12-07 18:48:54 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2077 from nghttp2/bump-ngtcp2

Browse Source 
Bump ngtcp2 dependencies
This commit is contained in:
Tatsuhiro Tsujikawa
2024-02-18 18:37:39 +09:00
committed by GitHub
parent 532791209e d1035d439a
commit fe56b875b4
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/build.yml vendored
View File

@@ -7,11 +7,11 @@ permissions: read-all
env: env:
LIBBPF_VERSION: v1.3.0 LIBBPF_VERSION: v1.3.0
OPENSSL1_VERSION: 1_1_1w+quic OPENSSL1_VERSION: 1_1_1w+quic
OPENSSL3_VERSION: 3.1.4+quic OPENSSL3_VERSION: 3.1.5+quic
BORINGSSL_VERSION: f42be90d665b6a376177648ccbb76fbbd6497c13 BORINGSSL_VERSION: 8e6a26d128484b886e6dcbfa558b993d38950bb5
AWSLC_VERSION: v1.20.0 AWSLC_VERSION: v1.21.0
NGHTTP3_VERSION: v1.1.0 NGHTTP3_VERSION: v1.2.0
NGTCP2_VERSION: v1.2.0 NGTCP2_VERSION: v1.3.0
jobs: jobs:
build-cache: build-cache:
@@ -159,6 +159,7 @@ jobs:
run: | run: |
git clone --depth 1 -b ${{ env.NGHTTP3_VERSION}} https://github.com/ngtcp2/nghttp3 git clone --depth 1 -b ${{ env.NGHTTP3_VERSION}} https://github.com/ngtcp2/nghttp3
cd nghttp3 cd nghttp3
git submodule update --init --depth 1
autoreconf -i autoreconf -i
./configure --prefix=$PWD/build --enable-lib-only ./configure --prefix=$PWD/build --enable-lib-only
make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)" check make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)" check
@@ -168,6 +169,7 @@ jobs:
run: | run: |
git clone --depth 1 -b ${{ env.NGTCP2_VERSION }} https://github.com/ngtcp2/ngtcp2 ngtcp2-openssl1 git clone --depth 1 -b ${{ env.NGTCP2_VERSION }} https://github.com/ngtcp2/ngtcp2 ngtcp2-openssl1
cd ngtcp2-openssl1 cd ngtcp2-openssl1
git submodule update --init --depth 1
autoreconf -i autoreconf -i
./configure --prefix=$PWD/build --enable-lib-only \ ./configure --prefix=$PWD/build --enable-lib-only \
PKG_CONFIG_PATH="../openssl1/build/lib/pkgconfig" \ PKG_CONFIG_PATH="../openssl1/build/lib/pkgconfig" \
@@ -181,6 +183,7 @@ jobs:
run: | run: |
git clone --depth 1 -b ${{ env.NGTCP2_VERSION }} https://github.com/ngtcp2/ngtcp2 ngtcp2-openssl3 git clone --depth 1 -b ${{ env.NGTCP2_VERSION }} https://github.com/ngtcp2/ngtcp2 ngtcp2-openssl3
cd ngtcp2-openssl3 cd ngtcp2-openssl3
git submodule update --init --depth 1
autoreconf -i autoreconf -i
./configure --prefix=$PWD/build --enable-lib-only \ ./configure --prefix=$PWD/build --enable-lib-only \
PKG_CONFIG_PATH="../openssl3/build/lib/pkgconfig" \ PKG_CONFIG_PATH="../openssl3/build/lib/pkgconfig" \

10
README.rst
View File

@@ -127,7 +127,7 @@ following libraries are required:
<https://github.com/quictls/openssl/tree/OpenSSL_1_1_1w+quic>`_; or <https://github.com/quictls/openssl/tree/OpenSSL_1_1_1w+quic>`_; or
LibreSSL (does not support 0RTT); or aws-lc; or LibreSSL (does not support 0RTT); or aws-lc; or
`BoringSSL <https://boringssl.googlesource.com/boringssl/>`_ (commit `BoringSSL <https://boringssl.googlesource.com/boringssl/>`_ (commit
f42be90d665b6a376177648ccbb76fbbd6497c13) 8e6a26d128484b886e6dcbfa558b993d38950bb5)
* `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_ >= 1.0.0 * `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_ >= 1.0.0
* `nghttp3 <https://github.com/ngtcp2/nghttp3>`_ >= 1.1.0 * `nghttp3 <https://github.com/ngtcp2/nghttp3>`_ >= 1.1.0
@@ -341,7 +341,7 @@ Build aws-lc:
.. code-block:: text .. code-block:: text
$ git clone --depth 1 -b v1.20.0 https://github.com/aws/aws-lc $ git clone --depth 1 -b v1.21.0 https://github.com/aws/aws-lc
$ cd aws-lc $ cd aws-lc
$ cmake -B build -DDISABLE_GO=ON --install-prefix=$PWD/opt $ cmake -B build -DDISABLE_GO=ON --install-prefix=$PWD/opt
$ make -j$(nproc) -C build $ make -j$(nproc) -C build
@@ -352,8 +352,9 @@ Build nghttp3:
.. code-block:: text .. code-block:: text
$ git clone --depth 1 -b v1.1.0 https://github.com/ngtcp2/nghttp3 $ git clone --depth 1 -b v1.2.0 https://github.com/ngtcp2/nghttp3
$ cd nghttp3 $ cd nghttp3
$ git submodule update --init --depth 1
$ autoreconf -i $ autoreconf -i
$ ./configure --prefix=$PWD/build --enable-lib-only $ ./configure --prefix=$PWD/build --enable-lib-only
$ make -j$(nproc) $ make -j$(nproc)
@@ -364,8 +365,9 @@ Build ngtcp2:
.. code-block:: text .. code-block:: text
$ git clone --depth 1 -b v1.2.0 https://github.com/ngtcp2/ngtcp2 $ git clone --depth 1 -b v1.3.0 https://github.com/ngtcp2/ngtcp2
$ cd ngtcp2 $ cd ngtcp2
$ git submodule update --init --depth 1
$ autoreconf -i $ autoreconf -i
$ ./configure --prefix=$PWD/build --enable-lib-only --with-boringssl \ $ ./configure --prefix=$PWD/build --enable-lib-only --with-boringssl \
BORINGSSL_CFLAGS="-I$PWD/../aws-lc/opt/include" \ BORINGSSL_CFLAGS="-I$PWD/../aws-lc/opt/include" \

8
docker/Dockerfile
View File

@@ -9,7 +9,7 @@ RUN apt-get update && \
zlib1g-dev libev-dev libjemalloc-dev ruby-dev libc-ares-dev bison \ zlib1g-dev libev-dev libjemalloc-dev ruby-dev libc-ares-dev bison \
libelf-dev libbrotli-dev libelf-dev libbrotli-dev
RUN git clone --depth 1 -b v1.20.0 https://github.com/aws/aws-lc && \ RUN git clone --depth 1 -b v1.21.0 https://github.com/aws/aws-lc && \
cd aws-lc && \ cd aws-lc && \
cmake -B build -DDISABLE_GO=ON && \ cmake -B build -DDISABLE_GO=ON && \
make -j$(nproc) -C build && \ make -j$(nproc) -C build && \
@@ -17,8 +17,9 @@ RUN git clone --depth 1 -b v1.20.0 https://github.com/aws/aws-lc && \
cd .. && \ cd .. && \
rm -rf aws-lc rm -rf aws-lc
RUN git clone --depth 1 -b v1.1.0 https://github.com/ngtcp2/nghttp3 && \ RUN git clone --depth 1 -b v1.2.0 https://github.com/ngtcp2/nghttp3 && \
cd nghttp3 && \ cd nghttp3 && \
git submodule update --init --depth 1 && \
autoreconf -i && \ autoreconf -i && \
./configure --enable-lib-only && \ ./configure --enable-lib-only && \
make -j$(nproc) && \ make -j$(nproc) && \
@@ -26,8 +27,9 @@ RUN git clone --depth 1 -b v1.1.0 https://github.com/ngtcp2/nghttp3 && \
cd .. && \ cd .. && \
rm -rf nghttp3 rm -rf nghttp3
RUN git clone --depth 1 -b v1.2.0 https://github.com/ngtcp2/ngtcp2 && \ RUN git clone --depth 1 -b v1.3.0 https://github.com/ngtcp2/ngtcp2 && \
cd ngtcp2 && \ cd ngtcp2 && \
git submodule update --init --depth 1 && \
autoreconf -i && \ autoreconf -i && \
./configure --enable-lib-only --with-boringssl \ ./configure --enable-lib-only --with-boringssl \
LIBTOOL_LDFLAGS="-static-libtool-libs" \ LIBTOOL_LDFLAGS="-static-libtool-libs" \