summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaiki Ueno <dueno@redhat.com>2020-11-20 06:10:49 +0100
committerDaniel Stenberg <daniel@haxx.se>2020-11-22 16:40:05 +0100
commit898fca27cda7e94f6fcd7fbb7b58d5aec330061c (patch)
tree34f4d9da7a5c9152b0e21b3291fc8ae95e50aa36
parent7fa6d5e383758dd2e196ab4266c7fdb84e66a012 (diff)
downloadgnurl-898fca27cda7e94f6fcd7fbb7b58d5aec330061c.tar.gz
gnurl-898fca27cda7e94f6fcd7fbb7b58d5aec330061c.tar.bz2
gnurl-898fca27cda7e94f6fcd7fbb7b58d5aec330061c.zip
http3: use the master branch of GnuTLS for testing
Closes #6235
-rw-r--r--docs/HTTP3.md8
-rwxr-xr-xscripts/travis/before_script.sh2
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/HTTP3.md b/docs/HTTP3.md
index b32d4e384..2a6123711 100644
--- a/docs/HTTP3.md
+++ b/docs/HTTP3.md
@@ -55,7 +55,7 @@ Build ngtcp2
% git clone https://github.com/ngtcp2/ngtcp2
% cd ngtcp2
% autoreconf -i
- % ./configure PKG_CONFIG_PATH=<somewhere1>/lib/pkgconfig:<somewhere2>/lib/pkgconfig LDFLAGS="-Wl,-rpath,<somewhere1>/lib" --prefix=<somewhere3>
+ % ./configure PKG_CONFIG_PATH=<somewhere1>/lib/pkgconfig:<somewhere2>/lib/pkgconfig LDFLAGS="-Wl,-rpath,<somewhere1>/lib" --prefix=<somewhere3> --enable-lib-only
% make
% make install
@@ -70,9 +70,9 @@ Build curl
## Build with GnuTLS
-Build (patched) GnuTLS
+Build GnuTLS
- % git clone --depth 1 -b tmp-quic https://gitlab.com/gnutls/gnutls.git
+ % git clone --depth 1 https://gitlab.com/gnutls/gnutls.git
% cd gnutls
% ./bootstrap
% ./configure --disable-doc --prefix=<somewhere1>
@@ -95,7 +95,7 @@ Build ngtcp2
% git clone https://github.com/ngtcp2/ngtcp2
% cd ngtcp2
% autoreconf -i
- % ./configure PKG_CONFIG_PATH=<somewhere1>/lib/pkgconfig:<somewhere2>/lib/pkgconfig LDFLAGS="-Wl,-rpath,<somewhere1>/lib" --prefix=<somewhere3>
+ % ./configure PKG_CONFIG_PATH=<somewhere1>/lib/pkgconfig:<somewhere2>/lib/pkgconfig LDFLAGS="-Wl,-rpath,<somewhere1>/lib" --prefix=<somewhere3> --enable-lib-only
% make
% make install
diff --git a/scripts/travis/before_script.sh b/scripts/travis/before_script.sh
index 1677b22a3..83dc1e31b 100755
--- a/scripts/travis/before_script.sh
+++ b/scripts/travis/before_script.sh
@@ -35,7 +35,7 @@ if [ "$NGTCP2" = yes ]; then
make install
cd $HOME
- git clone --depth 1 -b tmp-quic https://gitlab.com/gnutls/gnutls.git pgtls
+ git clone --depth 1 https://gitlab.com/gnutls/gnutls.git pgtls
cd pgtls
./bootstrap
./configure PKG_CONFIG_PATH=$HOME/ngbuild/lib/pkgconfig LDFLAGS="-Wl,-rpath,$HOME/ngbuild/lib" --with-included-libtasn1 --with-included-unistring --disable-guile --disable-doc --prefix=$HOME/ngbuild