The branch stable/14 has been updated by bapt:
URL:
https://cgit.FreeBSD.org/src/commit/?id=cf48057f3ea9cf19e31fb03404bc2a73cc35ba43
commit cf48057f3ea9cf19e31fb03404bc2a73cc35ba43
Author: Baptiste Daroussin <b...@freebsd.org>
AuthorDate: 2024-09-09 15:17:27 +0000
Commit: Baptiste Daroussin <b...@freebsd.org>
CommitDate: 2025-07-08 14:27:17 +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
(cherry picked from commit 7899f917b1c0ea178f1d2be0cfb452086d079d23)
---
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 cb193f677b30..d9ac4491ef77 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -3178,8 +3178,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
@@ -3235,7 +3234,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 855d7ca0279e..2fa992731715 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -149,11 +149,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 <bsd.subdir.mk>
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 <bsd.lib.mk>
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 <bsd.lib.mk>
diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile
index 4173e43baab2..4b4b2c94eca4 100644
--- a/libexec/flua/Makefile
+++ b/libexec/flua/Makefile
@@ -1,6 +1,11 @@
.include <src.lua.mk>
+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 <bsd.lib.mk>
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 <bsd.lib.mk>
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 c7649c724c0a..2786c9b0e8f3 100644
--- a/lib/flua/libjail/Makefile
+++ b/libexec/flua/libjail/Makefile
@@ -1,13 +1,8 @@
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 a1cb39f8b4a0..9f4154d59219 100644
--- a/stand/defs.mk
+++ b/stand/defs.mk
@@ -69,7 +69,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"
