From: Michal Nowak <mnowak@isc.org>
Date: Tue, 2 Jun 2026 09:37:02 +0000 (+0000)
Subject: Base the readline check on the configured flags
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d9adf2e4e8067c529394115136762dd6127810d;p=thirdparty%2Fbind9.git

Base the readline check on the configured flags

WITH_LIBEDIT/WITHOUT_LIBEDIT are always-set globals, so the check
always asserted libedit was absent. Inspect EXTRA_CONFIGURE instead.

Assisted-by: Claude:claude-opus-4-8
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fe42603371..a4ad6a697e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -429,11 +429,14 @@ stages:
     - find -name 'tsan.*' -exec "$PYTHON" "$CI_PROJECT_DIR"/bind9-qa/ci/parse_tsan.py {} \;
 
 .check_readline_setup: &check_readline_setup
-    - if [[ -n "${WITHOUT_LIBEDIT}" ]]; then
-        ! grep "^#define HAVE_LIBEDIT" build/config.h;
-      elif [[ -n "${WITH_LIBEDIT}" ]]; then
-        grep -e "^#define HAVE_LIBEDIT" build/config.h;
-      fi
+    # WITH_LIBEDIT/WITHOUT_LIBEDIT are always-set global variables, so inspect
+    # the actual per-job configure flags to decide what to assert.
+    - case " ${EXTRA_CONFIGURE} " in
+        *" -Dline=disabled "*)
+          ! grep -e "^#define HAVE_LIBEDIT" build/config.h;;
+        *" -Dline=enabled "*)
+          grep -e "^#define HAVE_LIBEDIT" build/config.h;;
+      esac
 
 .list_installed_package_versions: &list_installed_package_versions
   - echo -e "\e[0Ksection_start:`date +%s`:installed_packages_section[collapsed=true]\r\e[0KHeader of the installed packages collapsible section"