git: a71fea51cecf - main - contrib/libucl: Revert to old behavior of macros
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 08 Apr 2026 07:16:29 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/src/commit/?id=a71fea51cecfe3bb70247ad62668e380e0f069ad
commit a71fea51cecfe3bb70247ad62668e380e0f069ad
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2026-04-07 18:27:20 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2026-04-08 07:10:26 +0000
contrib/libucl: Revert to old behavior of macros
Enable macros and includes by default as this is breaking package
building on HEAD. libucl 0.9.3 by default changed the behavior of
includes and macros. These were previously enabled but it switched to
disabled which breaks the package building in HEAD. This is a temporary
workaround for now to fix the package building specially for
releng/15.0. This might be reverted post EOL of 15.0 in the coming
months.
Reported by: ivy
Fixes: abda442d92fd ("contrib/libucl: Import libucl 0.9.3")
Tested by: ivy
Approved by: ivy, kevans
Differential Revision: https://reviews.freebsd.org/D56294
---
contrib/libucl/lua/lua_ucl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/libucl/lua/lua_ucl.c b/contrib/libucl/lua/lua_ucl.c
index 0420ad87e26f..8664855b2d25 100644
--- a/contrib/libucl/lua/lua_ucl.c
+++ b/contrib/libucl/lua/lua_ucl.c
@@ -656,7 +656,7 @@ lua_ucl_parser_init (lua_State *L)
* files. Macros in the parser are very dangerous and should be used
* for trusted data only.
*/
- int flags = UCL_PARSER_NO_FILEVARS|UCL_PARSER_DISABLE_MACRO;
+ int flags = 0;
if (lua_gettop (L) >= 1) {
flags = lua_tonumber (L, 1);