From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 10 May 2022 07:33:02 +0000 (+0200)
Subject: zuul: fix the ngtcp2-gnutls build
X-Git-Tag: curl-7_83_1~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3be1e9c642fbc3e404162ec44e3f3928d91051f0;p=thirdparty%2Fcurl.git

zuul: fix the ngtcp2-gnutls build

Add packages and tweak the configure options.

Use the GnuTLS 3.7.4 branch (not main).

Closes #8829
---

diff --git a/scripts/zuul/before_script.sh b/scripts/zuul/before_script.sh
index 9ca8a911d2..ac766d3eec 100755
--- a/scripts/zuul/before_script.sh
+++ b/scripts/zuul/before_script.sh
@@ -35,10 +35,10 @@ if [ "$NGTCP2" = yes ]; then
     make install
 
     cd $HOME
-    git clone --depth 1 https://gitlab.com/gnutls/gnutls.git pgtls
+    git clone --depth 1 -b 3.7.4 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
+    ./configure PKG_CONFIG_PATH=$HOME/ngbuild/lib/pkgconfig LDFLAGS="-Wl,-rpath,$HOME/ngbuild/lib" --with-included-libtasn1 --with-included-unistring --disable-guile --disable-doc --disable-tools --without-zstd --disable-psk-authentication --prefix=$HOME/ngbuild
     make
     make install
   else
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 0ae03bd46d..69f25fa62d 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -125,6 +125,7 @@
         - libpsl-dev
         - libbrotli-dev
         - libzstd-dev
+        - zlib1g-dev
         - autogen
         - automake
         - autopoint
@@ -135,6 +136,9 @@
         - libp11-kit-dev
         - libtasn1-6-dev
         - nettle-dev
+        - gtk-doc-tools
+        - gnulib
+        - libtasn1-bin
       curl_env:
         CC: gcc-8
         CXX: g++-8