From nobody Thu Sep 12 07:08:30 2024 X-Original-To: dev-commits-src-main@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 4X47np4vj3z5V4rD; Thu, 12 Sep 2024 07:08:30 +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 4X47np4KjHz4QTn; Thu, 12 Sep 2024 07:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726124910; 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=gGBv2b7nPk/JFRwIQsXm3R7JK85wUIVSG3h8VZ97igk=; b=Re2Bwb0qoLCFlg6smehIn1uSaghVFV3YvA1nW51Hj7EIvBwKeG1+3nVn/TdAG6dSCb79+1 akvHE6BSYZhin6z6qlg3av/ywb8Gtbog0Z9VCez12qENPrlI2m5IIVdJ8E4ValOL9wB+z1 uVi/5H8ZCVY4e8I+XUDcBNfNpcI0Nro8Gc7+WQtK+Ud21qawMKNXLynlFQfEpaPsibnrcy I+Ac6EN/GUjnzaZt6mM0cKvz3vf5EMvsf+D0FsSwv/Q+1gkVOfdKB97fbmCY2N+e6Pkxzl tYO1mau1F/Ye0AsANuRRUbQaKhZt0ytVuSdbhL6PIc9cwcunr3i08PoN5xgOUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726124910; a=rsa-sha256; cv=none; b=nAkfc5vXFDtgkUFZFJiYIRyBSE6BEAOTz5PnVHpWoVq8wa2eibYS/eA17hNeym9iEw/J6A cLLErXU+/agyVtpLSndgItIr76/Iw+UixWyHDkc0rT4+123OgFiZLnPQB8Q54o3t2e2xOP +EQgrLXJ/WlP8bj3iDEMGLQsPU7GYTCfcKqFRmJvHF2nyFEDBAf7Uz4h18Fw2F7cieUWoO 8DkmZrAJ4NarwruF/ld4lHD6X2e6F7m0KC3/sttNEQJ9B/GIlfWchCsrlIP2bADHc4KrA4 qxSX7adiMnuUaophK4M+FGu0VZr1cxRaAACghjaO0hv/VsYNBc8HOk8iVCU4Bw== 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=1726124910; 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=gGBv2b7nPk/JFRwIQsXm3R7JK85wUIVSG3h8VZ97igk=; b=BcPH44jBHQGQmOnRvcN3e3TeGa/c84hMSGJLAw1yuHfKaKJJoYAm/ULYIk1bynKv6EVh7k /Rkc7d7Ri13UHFihbbHUZsZ4DN1oFg/La0os9Ij2IvEXZVKLP26TfHozxQ/5qKQM3bJqBo fnvpSrYyWOaw96wvhkHtafHLA4IIbRkEe4C2/iwbG/LNIlxE5Cj3SoTdeRcMkeWrRrDF9V 2hB0uV2pnUM274v/agfpV4EIIPgax/zM/fjnhuZcFUgbNv5xPP21k7ldxLItJuYhpg2znG hQ4jfVAqGuFbug8SMXbKjOFlijgLib8fu/FgDQxhM5N2B2+xJD6EObmpowplHw== 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 4X47np3xC0z152w; Thu, 12 Sep 2024 07:08:30 +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 48C78UA8089022; Thu, 12 Sep 2024 07:08:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48C78Uwf089019; Thu, 12 Sep 2024 07:08:30 GMT (envelope-from git) Date: Thu, 12 Sep 2024 07:08:30 GMT Message-Id: <202409120708.48C78Uwf089019@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: 7899f917b1c0 - main - flua: move modules source into the main source directory List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 7899f917b1c0ea178f1d2be0cfb452086d079d23 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=7899f917b1c0ea178f1d2be0cfb452086d079d23 commit 7899f917b1c0ea178f1d2be0cfb452086d079d23 Author: Baptiste Daroussin AuthorDate: 2024-09-09 15:17:27 +0000 Commit: Baptiste Daroussin CommitDate: 2024-09-12 07:03:44 +0000 flua: move modules source into the main source directory Follow the path of what is done with bsnmp, build the modules along with the main binary, this allows to build the modules at a moment where all needed libraries are already built and available in the linker path instead of having to declare all the libraries which a flua module will be linked to in _prebuild_libs. Discused with: markj Reviewed by: markj, jrtc27, kevans, imp Accepted by: kevans, imp Differential Revision: https://reviews.freebsd.org/D46610 --- Makefile.inc1 | 4 +--- lib/Makefile | 5 ----- lib/flua/Makefile | 6 ------ lib/flua/libfreebsd/sys/linker/Makefile | 12 ------------ lib/flua/libhash/Makefile | 14 -------------- libexec/flua/Makefile | 5 +++++ libexec/flua/Makefile.inc | 5 +++++ {lib => libexec}/flua/libfreebsd/Makefile | 0 libexec/flua/libfreebsd/Makefile.inc | 1 + {lib => libexec}/flua/libfreebsd/sys/Makefile | 0 libexec/flua/libfreebsd/sys/Makefile.inc | 1 + libexec/flua/libfreebsd/sys/linker/Makefile | 7 +++++++ .../flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua | 0 {lib => libexec}/flua/libfreebsd/sys/linker/linker.c | 0 libexec/flua/libhash/Makefile | 9 +++++++++ {lib => libexec}/flua/libhash/hash.3lua | 0 {lib => libexec}/flua/libhash/lhash.c | 0 {lib => libexec}/flua/libhash/lhash.h | 0 {lib => libexec}/flua/libjail/Makefile | 5 ----- {lib => libexec}/flua/libjail/jail.3lua | 0 {lib => libexec}/flua/libjail/lua_jail.c | 0 {lib => libexec}/flua/libucl/Makefile | 3 --- stand/defs.mk | 2 +- 23 files changed, 30 insertions(+), 49 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 57141a482433..991e9973fb04 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3236,8 +3236,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \ lib/libxo \ ${_secure_lib_libcrypto} ${_secure_lib_libssl} \ - ${_lib_libldns} ${_secure_lib_libssh} \ - lib/libucl + ${_lib_libldns} ${_secure_lib_libssh} .if ${MK_DIALOG} != "no" _prebuild_libs+= gnu/lib/libdialog @@ -3292,7 +3291,6 @@ _generic_libs+= ${_DIR} lib/libtacplus__L: lib/libmd__L lib/libpam/libpam__L lib/libxo__L: lib/libutil__L -lib/libucl__L: lib/msun__L .if ${MK_CDDL} != "no" _cddl_lib_libumem= cddl/lib/libumem diff --git a/lib/Makefile b/lib/Makefile index 8860bfeb1770..221eac74ee26 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -150,11 +150,6 @@ SUBDIR_DEPEND_libpcap= ofed .endif SUBDIR_DEPEND_nss_tacplus= libtacplus -.if !defined(COMPAT_LIBCOMPAT) -SUBDIR+= flua -SUBDIR_DEPEND_flua= libjail libucl -.endif - # NB: keep these sorted by MK_* knobs SUBDIR.${MK_BEARSSL}+= libbearssl libsecureboot diff --git a/lib/flua/Makefile b/lib/flua/Makefile deleted file mode 100644 index d88e76f61062..000000000000 --- a/lib/flua/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -SUBDIR+= libfreebsd -SUBDIR+= libhash -SUBDIR+= libjail -SUBDIR+= libucl - -.include diff --git a/lib/flua/libfreebsd/sys/linker/Makefile b/lib/flua/libfreebsd/sys/linker/Makefile deleted file mode 100644 index 572b5949d2a1..000000000000 --- a/lib/flua/libfreebsd/sys/linker/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -SHLIB_NAME= linker.so -SHLIBDIR= ${LIBDIR}/flua/freebsd/sys - -SRCS+= linker.c - -CFLAGS+= \ - -I${SRCTOP}/contrib/lua/src \ - -I${SRCTOP}/lib/liblua \ - -MAN= freebsd.sys.linker.3lua - -.include diff --git a/lib/flua/libhash/Makefile b/lib/flua/libhash/Makefile deleted file mode 100644 index f166ff90a392..000000000000 --- a/lib/flua/libhash/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -SHLIB_NAME= hash.so -SHLIBDIR= ${LIBDIR}/flua - -SRCS+= lhash.c - -CFLAGS+= \ - -I${SRCTOP}/contrib/lua/src \ - -I${SRCTOP}/lib/liblua \ - -LIBADD+= md - -MAN= hash.3lua - -.include diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile index c8206b94769d..08ea9c002d61 100644 --- a/libexec/flua/Makefile +++ b/libexec/flua/Makefile @@ -1,5 +1,10 @@ .include +SUBDIR+= libfreebsd +SUBDIR+= libhash +SUBDIR+= libjail +SUBDIR+= libucl + LUASRC?= ${SRCTOP}/contrib/lua/src .PATH: ${LUASRC} diff --git a/libexec/flua/Makefile.inc b/libexec/flua/Makefile.inc new file mode 100644 index 000000000000..34505d54d7df --- /dev/null +++ b/libexec/flua/Makefile.inc @@ -0,0 +1,5 @@ +SHLIBDIR?= ${LIBDIR}/flua + +CFLAGS+= \ + -I${SRCTOP}/contrib/lua/src \ + -I${SRCTOP}/lib/liblua diff --git a/lib/flua/libfreebsd/Makefile b/libexec/flua/libfreebsd/Makefile similarity index 100% rename from lib/flua/libfreebsd/Makefile rename to libexec/flua/libfreebsd/Makefile diff --git a/libexec/flua/libfreebsd/Makefile.inc b/libexec/flua/libfreebsd/Makefile.inc new file mode 100644 index 000000000000..01b5f23410c8 --- /dev/null +++ b/libexec/flua/libfreebsd/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/lib/flua/libfreebsd/sys/Makefile b/libexec/flua/libfreebsd/sys/Makefile similarity index 100% rename from lib/flua/libfreebsd/sys/Makefile rename to libexec/flua/libfreebsd/sys/Makefile diff --git a/libexec/flua/libfreebsd/sys/Makefile.inc b/libexec/flua/libfreebsd/sys/Makefile.inc new file mode 100644 index 000000000000..01b5f23410c8 --- /dev/null +++ b/libexec/flua/libfreebsd/sys/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/libexec/flua/libfreebsd/sys/linker/Makefile b/libexec/flua/libfreebsd/sys/linker/Makefile new file mode 100644 index 000000000000..1adf547b503c --- /dev/null +++ b/libexec/flua/libfreebsd/sys/linker/Makefile @@ -0,0 +1,7 @@ +SHLIB_NAME= linker.so + +SRCS+= linker.c + +MAN= freebsd.sys.linker.3lua + +.include diff --git a/lib/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua b/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua similarity index 100% rename from lib/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua rename to libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua diff --git a/lib/flua/libfreebsd/sys/linker/linker.c b/libexec/flua/libfreebsd/sys/linker/linker.c similarity index 100% rename from lib/flua/libfreebsd/sys/linker/linker.c rename to libexec/flua/libfreebsd/sys/linker/linker.c diff --git a/libexec/flua/libhash/Makefile b/libexec/flua/libhash/Makefile new file mode 100644 index 000000000000..b7c8d7ee9948 --- /dev/null +++ b/libexec/flua/libhash/Makefile @@ -0,0 +1,9 @@ +SHLIB_NAME= hash.so + +SRCS+= lhash.c + +LIBADD+= md + +MAN= hash.3lua + +.include diff --git a/lib/flua/libhash/hash.3lua b/libexec/flua/libhash/hash.3lua similarity index 100% rename from lib/flua/libhash/hash.3lua rename to libexec/flua/libhash/hash.3lua diff --git a/lib/flua/libhash/lhash.c b/libexec/flua/libhash/lhash.c similarity index 100% rename from lib/flua/libhash/lhash.c rename to libexec/flua/libhash/lhash.c diff --git a/lib/flua/libhash/lhash.h b/libexec/flua/libhash/lhash.h similarity index 100% rename from lib/flua/libhash/lhash.h rename to libexec/flua/libhash/lhash.h diff --git a/lib/flua/libjail/Makefile b/libexec/flua/libjail/Makefile similarity index 50% rename from lib/flua/libjail/Makefile rename to libexec/flua/libjail/Makefile index 2b9b6c777cbb..20cd9f5f1429 100644 --- a/lib/flua/libjail/Makefile +++ b/libexec/flua/libjail/Makefile @@ -1,12 +1,7 @@ SHLIB_NAME= jail.so -SHLIBDIR= ${LIBDIR}/flua SRCS+= lua_jail.c -CFLAGS+= \ - -I${SRCTOP}/contrib/lua/src \ - -I${SRCTOP}/lib/liblua \ - LIBADD+= jail MAN= jail.3lua diff --git a/lib/flua/libjail/jail.3lua b/libexec/flua/libjail/jail.3lua similarity index 100% rename from lib/flua/libjail/jail.3lua rename to libexec/flua/libjail/jail.3lua diff --git a/lib/flua/libjail/lua_jail.c b/libexec/flua/libjail/lua_jail.c similarity index 100% rename from lib/flua/libjail/lua_jail.c rename to libexec/flua/libjail/lua_jail.c diff --git a/lib/flua/libucl/Makefile b/libexec/flua/libucl/Makefile similarity index 72% rename from lib/flua/libucl/Makefile rename to libexec/flua/libucl/Makefile index 7d2681b85fcb..a88c8bda6bfc 100644 --- a/lib/flua/libucl/Makefile +++ b/libexec/flua/libucl/Makefile @@ -1,5 +1,4 @@ SHLIB_NAME= ucl.so -SHLIBDIR= ${LIBDIR}/flua WARNS= 2 @@ -7,8 +6,6 @@ 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 diff --git a/stand/defs.mk b/stand/defs.mk index 452ba060c504..bd19c8d8e125 100644 --- a/stand/defs.mk +++ b/stand/defs.mk @@ -64,7 +64,7 @@ BINDIR?= /boot # LUAPATH is where we search for and install lua scripts. LUAPATH?= /boot/lua FLUASRC?= ${SRCTOP}/libexec/flua -FLUALIB?= ${SRCTOP}/lib/flua +FLUALIB?= ${SRCTOP}/libexec/flua LIBSA= ${BOOTOBJ}/libsa/libsa.a .if ${MACHINE} == "i386"