Page MenuHomeFreeBSD
Files F115941163

D46569.id143041.diff
No OneTemporary
Actions

D46569.id143041.diff
View Options

diff --git a/lib/flua/Makefile b/lib/flua/Makefile
--- a/lib/flua/Makefile
+++ b/lib/flua/Makefile
@@ -1,4 +1,5 @@
SUBDIR+= libhash
SUBDIR+= libjail
+SUBDIR+= libucl
.include <bsd.subdir.mk>
diff --git a/lib/flua/libucl/Makefile b/lib/flua/libucl/Makefile
new file mode 100644
--- /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 <bsd.lib.mk>
diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile
--- a/libexec/flua/Makefile
+++ b/libexec/flua/Makefile
@@ -4,7 +4,7 @@
.PATH: ${LUASRC}
PROG= flua
-WARNS?= 2
+WARNS?= 3
MAN= # No manpage; this is internal.
CWARNFLAGS.gcc+= -Wno-format-nonliteral
@@ -31,10 +31,4 @@
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 <bsd.prog.mk>
diff --git a/libexec/flua/linit_flua.c b/libexec/flua/linit_flua.c
--- 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 @@
{"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}
};

File Metadata

Mime Type
text/plain
Expires
Thu, May 1, 4:38 PM (8 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17886278
Default Alt Text
D46569.id143041.diff (1 KB)

Event Timeline