From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 16 Oct 2025 13:44:30 +0000 (+0200)
Subject: - simdzone-zone-load, fix ci, debug exclusions, lib path for automake
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2536b35d384ddb7058bb5cd074148135107f0f79;p=thirdparty%2Funbound.git

- simdzone-zone-load, fix ci, debug exclusions, lib path for automake
  for windows, automake version for openbsd, aclocal for freebsd, netbsd
  and openbsd.
---

diff --git a/.github/workflows/analysis_ports.yml b/.github/workflows/analysis_ports.yml
index 500e8a477..2960592dd 100644
--- a/.github/workflows/analysis_ports.yml
+++ b/.github/workflows/analysis_ports.yml
@@ -254,7 +254,7 @@ jobs:
           echo "unbound"
           cd unbound
           echo 'autoreconf -fi'
-          PERL5LIB="/c/msys64/usr/share/autoconf-2.71:/c/msys64/usr/share/autoconf" PERL="C:/msys64/usr/bin/perl" PATH="/c/msys64/usr/bin:$PATH" autoreconf -fi
+          PERL5LIB="/c/msys64/usr/share/autoconf-2.71:/c/msys64/usr/share/autoconf:/c/msys64/usr/share/automake-1.16:/c/msys64/usr/share/automake" PERL="C:/msys64/usr/bin/perl" PATH="/c/msys64/usr/bin:$PATH" autoreconf -fi
           echo "./configure --enable-debug --enable-static-exe --disable-flto \"--with-ssl=$prepath/openssl\" --with-libexpat=\"$prepath/expat\" --disable-shared"
           ./configure --enable-debug --enable-static-exe --disable-flto "--with-ssl=$prepath/openssl" --with-libexpat="$prepath/expat" --disable-shared
           make
@@ -371,7 +371,7 @@ jobs:
           run: |
             set -e -x
             if test "$CROSS_PLATFORM_OS" = "freebsd"; then sudo pkg install -y autoconf automake libtool openssl libevent expat; fi
-            if test "$CROSS_PLATFORM_OS" = "openbsd"; then sudo pkg_add autoconf-2.71 automake-1.16.5 libtool libevent; export AUTOCONF_VERSION="2.71"; export AUTOMAKE_VERSION="1.16.5"; fi
+            if test "$CROSS_PLATFORM_OS" = "openbsd"; then sudo pkg_add autoconf-2.71 automake-1.16.5 libtool libevent; export AUTOCONF_VERSION="2.71"; export AUTOMAKE_VERSION="1.16"; fi
             if test "$CROSS_PLATFORM_OS" = "netbsd"; then sudo pkgin -y install autoconf automake libtool libevent; export LDFLAGS="-Wl,--rpath=/usr/pkg/lib"; fi
             echo "::group::configure"
             autoconf && autoheader
@@ -381,6 +381,8 @@ jobs:
             libtoolize -c -i || glibtoolize -c -i
             (cd simdzone; libtoolize -c -i || glibtoolize -c -i)
             # run autoconf again.
+            aclocal
+            (cd simdzone; aclocal)
             autoconf && autoheader
             (cd simdzone && autoconf && autoheader)
             ./configure ${{ matrix.cross_platform_config }}