From nobody Fri Sep 06 15:25:01 2024 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 4X0g5V1VHHz5VKTY; Fri, 06 Sep 2024 15:25:02 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X0g5V12vVz4kB5; Fri, 6 Sep 2024 15:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725636302; 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=r4UkmLsLKzRT6KDH3fGop08kF/rPq+007PNEtrX/SEk=; b=PVRHjgF1A3YQ68V3gk/I5fU1wIQOWDrfYvnyD4kWZZ590wvjNjjjbPK6Qs6zFHF8DBHV7g ZC5GL7o3pp0pcqsqAEktL1cFGKPWKE5CKOA31tn94F9520qVhnHcUfewoXcdNwDdro/8G4 9IjvkF4gYBUxqpj04xx5i4tMrjODXOOvdQnWxpnShMUAVb0muKo+XmjUTFoDoHY7VAgVD4 fsLIE2BjOqg29yQNMYcOW9ZM7bZergDrrHpwTrWDsA7Pld8CbxTrPcrKiFNI/ZBrmbdpwO cLMQxLtlubHob7+EG4an466HxTN30gofS6efxuGOu6L9b/sFmJZjcaBDjcRkBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725636302; a=rsa-sha256; cv=none; b=WDpygHKLNGlvSpKEpFQ6d4s1lKXgUFT/y/eQqsKtlC3JV65BO2JmHEoDWAE1g2KYLSznAw EEHZN9gZsmTWgqt7gIFjc27OryRjECo7+iQs01Ml6RBP9uCuwA+2RjicGoGt9nmqjmJ1KC pAufMi61wCkXmUGuhaslAoLWfrA8PsxILr7XwUdphPvIfgLjYJlNYxwPxEXJWruhpZSBdk H1u3jU3YFR9ehB0CFvBBsMRl6G3ne4XBqQgoUUUPjl6WvwZ6A6Jjylu1rfwViMeT1N5EmA 4Wp9ubc+GFOYEvKQ7YVpb7Yuv0sFOJug+0EFlZaMW5ptr9+AO9c1QwtXX7Kl5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725636302; 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=r4UkmLsLKzRT6KDH3fGop08kF/rPq+007PNEtrX/SEk=; b=h4ud5HLZ+w4DrV0NdvSOaK6/dhKXo+2I47qeXRg17kj2NvajFTRrP/LkoK96QMyEMPx/94 kquvwdiHuKJsvuiye2tUcvnAQNn0LnB7hbHYVLaG+FfRfHUieOq0G1cO3ZiM0Ntth49gcc w0D6ZHM0kdRTXSatVYh53tlSRwRsmKAcqcJMU93eH2QvOzEpAmvyldZklP7b0ZMocesRj9 T3Yl9/ofNbiPLSWIzW4ITGLhwj87YcgQ8Y3OuLMFCU52NGfP4xaa43ZM/MZh+zF9jWBMuo b/NaGo2QQz4Ac6hJaxhn6oWThmYdnEY+W7RX9fxTUQWpfZgZaVfdL/B3Er1Fkg== 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 4X0g5V0LH2zxCk; Fri, 6 Sep 2024 15:25:02 +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 486FP1X0085931; Fri, 6 Sep 2024 15:25:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486FP1jZ085928; Fri, 6 Sep 2024 15:25:01 GMT (envelope-from git) Date: Fri, 6 Sep 2024 15:25:01 GMT Message-Id: <202409061525.486FP1jZ085928@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: bb2d016afb00 - main - 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/main X-Git-Reftype: branch X-Git-Commit: bb2d016afb009920f4bb2400c15a86e557b2d55a Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=bb2d016afb009920f4bb2400c15a86e557b2d55a commit bb2d016afb009920f4bb2400c15a86e557b2d55a Author: Baptiste Daroussin AuthorDate: 2024-09-06 15:13:08 +0000 Commit: Baptiste Daroussin CommitDate: 2024-09-06 15:21:29 +0000 flua: make the ucl module a dynamic module Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D46569 --- lib/flua/Makefile | 1 + lib/flua/libucl/Makefile | 17 +++++++++++++++++ libexec/flua/Makefile | 8 +------- libexec/flua/linit_flua.c | 2 -- 4 files changed, 19 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 e324ca993711..c8206b94769d 100644 --- a/libexec/flua/Makefile +++ b/libexec/flua/Makefile @@ -4,7 +4,7 @@ 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 +31,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 1b7d83016cfe..4635970d1fd7 100644 --- a/libexec/flua/linit_flua.c +++ b/libexec/flua/linit_flua.c @@ -36,7 +36,6 @@ #include "lfs.h" #include "lposix.h" #include "lfbsd.h" -#include "lua_ucl.h" /* ** these libs are loaded by lua.c and are readily available to any Lua @@ -61,7 +60,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}, {"fbsd", luaopen_fbsd}, {NULL, NULL} };