git: 976b2ebf4309 - stable/15 - packages: Fix build with libucl 0.9.3
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 07 Apr 2026 11:27:02 UTC
The branch stable/15 has been updated by ivy:
URL: https://cgit.FreeBSD.org/src/commit/?id=976b2ebf43094076d52e34c8dbeabae032caa6ad
commit 976b2ebf43094076d52e34c8dbeabae032caa6ad
Author: Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2026-04-06 17:11:22 +0000
Commit: Lexi Winter <ivy@FreeBSD.org>
CommitDate: 2026-04-07 10:49:51 +0000
packages: Fix build with libucl 0.9.3
In libucl 0.9.3, macros and includes are disabled by default when
creating a new UCL parser. This breaks the package build, which
relies on includes. Fix this by explicitly passing zero flags
to ucl.parser().
MFC after: 3 days
Fixes: abda442d92fd ("contrib/libucl: Import libucl 0.9.3")
Reviewed by: kevans, bapt
Reported by: freebsd@walstatt-de.de
Sponsored by: https://www.patreon.com/bsdivy
Differential Revision: https://reviews.freebsd.org/D56266
(cherry picked from commit 63d0e3e3aa2483420f828686336d6615616363d5)
---
release/packages/generate-set-ucl.lua | 2 +-
release/packages/generate-ucl.lua | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/release/packages/generate-set-ucl.lua b/release/packages/generate-set-ucl.lua
index 9ba7026b75df..7a1cddda7be1 100755
--- a/release/packages/generate-set-ucl.lua
+++ b/release/packages/generate-set-ucl.lua
@@ -16,7 +16,7 @@ substituted as UCL variables.
local ucl = require("ucl")
-- This parser is the output UCL we want to build.
-local parser = ucl.parser()
+local parser = ucl.parser(0)
if #arg < 1 then
io.stderr:write(arg[0] .. ": missing template filename\n")
diff --git a/release/packages/generate-ucl.lua b/release/packages/generate-ucl.lua
index 19a9a95d5d38..aaaa4375dd4d 100755
--- a/release/packages/generate-ucl.lua
+++ b/release/packages/generate-ucl.lua
@@ -124,7 +124,7 @@ local pkgprefix = nil
local pkgversion = nil
-- This parser is the output UCL we want to build.
-local parser = ucl.parser()
+local parser = ucl.parser(0)
-- Set any $VARIABLES from the command line in the parser. This causes ucl to
-- automatically replace them when we load the source ucl.