From 904852a5ca5ef01c6ffa3e0110dda5d2124ec823 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Wed, 4 Nov 2026 15:13:50 -0600
Subject: [PATCH 1/2] Added support for OPTS environment variable to
 ci/configure.sh

This enables buildscripts/ci/setup-cfengine-build-host.sh to use --with-pcre2=/opt/pcre2 for rhel-8 build hosts with insufficient version of pcre2. libntech needs 10.34+

Ticket: ENT-14716
Changelog: none
---
 ci/configure.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/configure.sh b/ci/configure.sh
index e47d02b6e12..8a7d986415d 100755
--- a/ci/configure.sh
+++ b/ci/configure.sh
@@ -4,7 +4,8 @@
 set -ex
 thisdir="$(dirname "$0")"
 cd "$thisdir"/..
-OPTS="--config-cache --enable-debug"
+# include any existing OPTS in calling environment
+OPTS="$OPTS --config-cache --enable-debug"
 
 if [ -f /etc/os-release ]; then
   source /etc/os-release

From 96ed8374efec5a87a86d664426e0b85eb10deaa3 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Wed, 4 Nov 2026 23:24:08 -0600
Subject: [PATCH 2/2] Added ldconfig to build_lmdb() in ci/dependencies.sh

This is needed on systems like rhel-8 which prefer /lib64.
build_lmdb() installs to /usr/lib and ldconfig takes care of linking things to /lib64 as it should.

Ticket: ENT-14716
Changelog: none
---
 ci/dependencies.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/dependencies.sh b/ci/dependencies.sh
index f3563ab676f..8d6d6af0181 100755
--- a/ci/dependencies.sh
+++ b/ci/dependencies.sh
@@ -24,6 +24,7 @@ build_lmdb() {
         cd lmdb/libraries/liblmdb
         make
         $GAINROOT make install prefix=/usr
+        $GAINROOT ldconfig
     )
 }