From nobody Tue Jul 08 14:32:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bc3Tl30L0z614cn; Tue, 08 Jul 2025 14:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3Tk5Ld7z49FB; Tue, 08 Jul 2025 14:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ZQ5yH17WcI064Aim1XM2iSKHAQvY3P0HPOFeXuCZSQ=; b=EuWURrlq1iubzdY6bkS8FvyWsMYxJRlMCJGLzH/LrYmVenUQJYQ0ybYykZH1VTyhz6ugWx b/JdzfZvvr7UMErmeXktDfvYLCJ7vM1NMUBSu5ezbzAPjuL34GWRYx6X7l8ol2VILaazTI bUBNpSZDZJUoEhGrTYflgDFZ7xp1Sh2UEzqEX1HYzuAi1ceTJfqclSaEzcZTn5CPBT0jMY e2Z0blcN1NC7atftX9SRTD7uv3x96Cwgq7WU9B5GdF68UJfxTVdFt+qZUkAN31v8AbIthi bZTTqWhoH3lY6eNcvbc4+XulftsCUVD/BW/yQbbNubCWdQILmKKxjLxtR1cyAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ZQ5yH17WcI064Aim1XM2iSKHAQvY3P0HPOFeXuCZSQ=; b=jc4o5RXjM9CVYYhGGaL4+zhSvnWBA2vMPtzigbiNaTAgBFGy911k4KoPm0y4VMYmpyG+iS JPb5aDp+HJ6w66YSqkWrwPnAcvIUc3+iCKTlazgk4tjrB5GTzX/U6+RBn+k2BCl07bdaVk 5EDyP5fA/nibD95KYibkFlUA7DetfuV+CRFTeDwa0lTaP/dCSPUOkkmYbgqDAmnnRNShoh oLxIkRgSx9zkbfuBeK5wNKdzimzh/I+O5N/IyK/VMt1f6u2CDlPQSzYB9VvNMwzQn/NYp8 UVghuMWuGI65MZ7r2DdT3oZ8dNklahxhPZ6R1piu+5tMxkSdowPaBN/KpJGTKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985130; a=rsa-sha256; cv=none; b=thnYJVWCHB0/AvkcBXbYbn0dHWrfwBeWMrLh+GopMR0WGdGMMslZtePVkDnRD61psGBUNE XqNeeuDycBl9hVtZY82e5Q+qRQCmuV7l5kmXhubsUTf82pb0wGJZQ82xYBNhvxAGe/YIE3 U5MxKdmcXdR+Eq4EtqYsvfWDD7SpXqBtL/XnCgKNj/7OijUSbjO2Wt1cLZXdYNBYN9nIQB hLjegrnny0F4TLAkTdgbonIG4e+9mdKf/G8eJ/TSmr7Vrq0kA5jIUvSICpBT1ovvyLHY+c qS3U039KqFDkr+zuhF+ctK8bHjjchipbiVSSJGYqLAo38m5OyuvNKtirPfG/Wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3Tk4PXPzgxF; Tue, 08 Jul 2025 14:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 568EWA6S071999; Tue, 8 Jul 2025 14:32:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWAvO071996; Tue, 8 Jul 2025 14:32:10 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:10 GMT Message-Id: <202507081432.568EWAvO071996@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: e6e6ac56887b - stable/14 - flua: make the ucl module a dynamic module List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e6e6ac56887b6072cc6cafce454cb0ef3a4e6ad9 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=e6e6ac56887b6072cc6cafce454cb0ef3a4e6ad9 commit e6e6ac56887b6072cc6cafce454cb0ef3a4e6ad9 Author: Baptiste Daroussin AuthorDate: 2024-09-06 15:13:08 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:17:08 +0000 flua: make the ucl module a dynamic module Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D46569 (cherry picked from commit bb2d016afb009920f4bb2400c15a86e557b2d55a) --- lib/flua/Makefile | 1 + lib/flua/libucl/Makefile | 17 +++++++++++++++++ libexec/flua/Makefile | 9 ++------- libexec/flua/linit_flua.c | 2 -- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/lib/flua/Makefile b/lib/flua/Makefile index 769736039f7e..168d05f54674 100644 --- a/lib/flua/Makefile +++ b/lib/flua/Makefile @@ -1,4 +1,5 @@ SUBDIR+= libhash SUBDIR+= libjail +SUBDIR+= libucl .include diff --git a/lib/flua/libucl/Makefile b/lib/flua/libucl/Makefile new file mode 100644 index 000000000000..7d2681b85fcb --- /dev/null +++ b/lib/flua/libucl/Makefile @@ -0,0 +1,17 @@ +SHLIB_NAME= ucl.so +SHLIBDIR= ${LIBDIR}/flua + +WARNS= 2 + +UCLSRC?= ${SRCTOP}/contrib/libucl +.PATH: ${UCLSRC}/lua +SRCS+= lua_ucl.c +CFLAGS+= \ + -I${SRCTOP}/contrib/lua/src \ + -I${SRCTOP}/lib/liblua \ + -I${UCLSRC}/include \ + -I${UCLSRC}/src \ + -I${UCLSRC}/uthash +LIBADD+= ucl + +.include diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile index f79b00d0bbf9..4173e43baab2 100644 --- a/libexec/flua/Makefile +++ b/libexec/flua/Makefile @@ -5,7 +5,8 @@ LUASRC?= ${SRCTOP}/contrib/lua/src .PATH: ${LUASRC} PROG= flua -WARNS?= 2 +WARNS?= 3 +MAN= # No manpage; this is internal. CWARNFLAGS.gcc+= -Wno-format-nonliteral @@ -31,10 +32,4 @@ LIBADD+= edit LDFLAGS+= -Wl,-E .endif -UCLSRC?= ${SRCTOP}/contrib/libucl -.PATH: ${UCLSRC}/lua -SRCS+= lua_ucl.c -CFLAGS+= -I${UCLSRC}/include -I${UCLSRC}/src -I${UCLSRC}/uthash -LIBADD+= ucl - .include diff --git a/libexec/flua/linit_flua.c b/libexec/flua/linit_flua.c index 6bc300095c27..87cabb58deb2 100644 --- a/libexec/flua/linit_flua.c +++ b/libexec/flua/linit_flua.c @@ -35,7 +35,6 @@ #include "lauxlib.h" #include "lfs.h" #include "lposix.h" -#include "lua_ucl.h" /* ** these libs are loaded by lua.c and are readily available to any Lua @@ -60,7 +59,6 @@ static const luaL_Reg loadedlibs[] = { {"posix.sys.stat", luaopen_posix_sys_stat}, {"posix.sys.utsname", luaopen_posix_sys_utsname}, {"posix.unistd", luaopen_posix_unistd}, - {"ucl", luaopen_ucl}, {NULL, NULL} };