Author: kevans
Date: Fri Aug 14 02:22:19 2020
New Revision: 364226
URL: https://svnweb.freebsd.org/changeset/base/364226
Log:
flua: don't allow dlopen, et al., for bootstrap flua
There are some logistics issues that need to be sorted out here before we
can actually allow this to work.
Modified:
head/lib/liblua/luaconf.h
head/libexec/flua/Makefile
Modified: head/lib/liblua/luaconf.h
==============================================================================
--- head/lib/liblua/luaconf.h Fri Aug 14 00:55:48 2020 (r364225)
+++ head/lib/liblua/luaconf.h Fri Aug 14 02:22:19 2020 (r364226)
@@ -75,7 +75,9 @@
/* Local modifications: need io.popen */
#ifdef __FreeBSD__
#define LUA_USE_POSIX
+#ifndef BOOTSTRAPPING
#define LUA_USE_DLOPEN
+#endif
#endif
/*
Modified: head/libexec/flua/Makefile
==============================================================================
--- head/libexec/flua/Makefile Fri Aug 14 00:55:48 2020 (r364225)
+++ head/libexec/flua/Makefile Fri Aug 14 02:22:19 2020 (r364226)
@@ -30,6 +30,10 @@ CFLAGS+= -DLUA_PROGNAME="\"${PROG}\""
CFLAGS+= -DLUA_USE_READLINE
CFLAGS+= -I${SRCTOP}/lib/libedit -I${SRCTOP}/contrib/libedit
LIBADD+= edit
+LDFLAGS+= -Wl,-E
+.else
+# We don't support dynamic libs on bootstrap builds.
+CFLAGS+= -DBOOTSTRAPPING
.endif
UCLSRC?= ${SRCTOP}/contrib/libucl
@@ -37,7 +41,5 @@ UCLSRC?= ${SRCTOP}/contrib/libucl
SRCS+= lua_ucl.c
CFLAGS+= -I${UCLSRC}/include -I${UCLSRC}/src -I${UCLSRC}/uthash
LIBADD+= ucl
-
-LDFLAGS+= -Wl,-E
.include <bsd.prog.mk>
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
