Date: Tue, 21 Apr 2026 15:44:26 +0000 From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Lexi Winter <ivy@FreeBSD.org> Subject: git: f3bbb238daa1 - releng/15.0 - packages: Fix build with libucl 0.9.3 Message-ID: <69e79b5a.34072.70f1e08b@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f3bbb238daa17cad6a5a6d562686c2e10e9768e5 commit f3bbb238daa17cad6a5a6d562686c2e10e9768e5 Author: Lexi Winter <ivy@FreeBSD.org> AuthorDate: 2026-04-06 17:11:22 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2026-04-15 19:02:38 +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(). Approved by: so Security: FreeBSD-EN-26:07.pkgbase 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) (cherry picked from commit 976b2ebf43094076d52e34c8dbeabae032caa6ad) --- 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.home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e79b5a.34072.70f1e08b>