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 9ca8a911d26d3aaee7d2de1e207f7ddfdc3b2904..ac766d3eec14ed512fdf018453a57a0562d49015 100755 (executable)
--- 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 0ae03bd46dad4cc3d328b5eaae0b8d0506c7810b..69f25fa62d8371ac6e58369d031f3c8cf28c2b4e 100644 (file)
--- 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