Page MenuHomeFreeBSD
Files F103149023

D46610.diff
No OneTemporary
Actions

D46610.diff
View Options

diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -3236,8 +3236,7 @@
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 @@
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
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -150,11 +150,6 @@
.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
--- 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
--- 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
--- 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
--- a/libexec/flua/Makefile
+++ b/libexec/flua/Makefile
@@ -1,5 +1,10 @@
.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
--- /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
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
--- /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
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
--- /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
--- /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
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
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
--- /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
rename from lib/flua/libhash/hash.3lua
rename to libexec/flua/libhash/hash.3lua
diff --git a/lib/flua/libhash/lhash.h b/libexec/flua/libhash/lhash.h
rename from lib/flua/libhash/lhash.h
rename to libexec/flua/libhash/lhash.h
diff --git a/lib/flua/libhash/lhash.c b/libexec/flua/libhash/lhash.c
rename from lib/flua/libhash/lhash.c
rename to libexec/flua/libhash/lhash.c
diff --git a/lib/flua/libjail/Makefile b/libexec/flua/libjail/Makefile
rename from lib/flua/libjail/Makefile
rename to libexec/flua/libjail/Makefile
--- 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
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
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
rename from lib/flua/libucl/Makefile
rename to libexec/flua/libucl/Makefile
--- 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 @@
.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
--- a/stand/defs.mk
+++ b/stand/defs.mk
@@ -64,7 +64,7 @@
# 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"

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 22, 3:25 PM (3 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14778625
Default Alt Text
D46610.diff (6 KB)

Event Timeline