From 8e258cfa768d604ad3342bf460876ee24f8aef91 Mon Sep 17 00:00:00 2001 From: Gleb Popov <6yearold@gmail.com> Date: Thu, 20 Aug 2026 23:57:07 +0300 Subject: [PATCH 1/2] FreeBSD CI: Explicitly pass --datadir and --sysconfdir to configure Reviewed-by: Alexey Tikhonov --- .github/workflows/build.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a22efc9d970..c92fef3be4a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,6 +98,10 @@ jobs: echo "::group::Build configuration" autoreconf -f -i + # We have to explicitly pass --datadir and --sysconfdir because the software + # uses these vars not only in Makefiles, but also as substitutions in various + # .in files. At the same time these values default contain the '${prefix}' + # string verbatim, which does not get expanded during the substitution. env CFLAGS=-isystem/usr/local/include \ CPPFLAGS='-isystem/usr/local/include' \ LDFLAGS=-L/usr/local/lib \ @@ -105,7 +109,9 @@ jobs: SOFTHSM2_PATH=/usr/local/lib/softhsm/libsofthsm2.so \ MAKE=gmake \ LIBS=-lintl \ - ./configure --disable-cifs-idmap-plugin \ + ./configure --datadir=/usr/local/share \ + --sysconfdir=/usr/local/etc \ + --disable-cifs-idmap-plugin \ --disable-linux-caps \ --without-autofs \ --without-selinux \ From 951cddc673586778b262737f27bb43d96e271700 Mon Sep 17 00:00:00 2001 From: Gleb Popov <6yearold@gmail.com> Date: Thu, 27 Aug 2026 17:17:03 +0300 Subject: [PATCH 2/2] FreeBSD CI: Do not reference an unset LOCALBASE variable Reviewed-by: Alexey Tikhonov --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c92fef3be4a..f96530ace92 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -117,8 +117,8 @@ jobs: --without-selinux \ --without-nfsv4-idmapd-plugin \ --with-smb-idmap-interface-version=6 \ - --with-adcli-path=${LOCALBASE}/sbin/adcli \ - --with-realm-path=${LOCALBASE}/sbin/realm \ + --with-adcli-path=/usr/local/sbin/adcli \ + --with-realm-path=/usr/local/sbin/realm \ --with-xml-catalog-path=/usr/local/share/xml/catalog \ --with-passkey echo "::endgroup::"