Date: Fri, 14 Aug 2020 02:40:18 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364227 - in head: lib/liblua libexec/flua Message-ID: <202008140240.07E2eIrt087573@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Fri Aug 14 02:40:17 2020 New Revision: 364227 URL: https://svnweb.freebsd.org/changeset/base/364227 Log: Properly disable LUA_USE_DLOPEN for bootstrap flua flua does have some specific bits that will include luaconf.h, but the definition of LUA_USE_DLOPEN for those won't matter. This belongs in liblua instead. To expand on my previous commit, which was a little sparse with details, it's not really safe to allow LUA_USE_DLOPEN with host lib paths being used. The host system could have an entirely different lua version and this could cause us to crash and burn. If we want to revive this later, we need to make sure to define c module paths inside OBJDIR that are compiled against whatever version we've bootstrapped. Pointy hat: kevans Modified: head/lib/liblua/Makefile head/libexec/flua/Makefile Modified: head/lib/liblua/Makefile ============================================================================== --- head/lib/liblua/Makefile Fri Aug 14 02:22:19 2020 (r364226) +++ head/lib/liblua/Makefile Fri Aug 14 02:40:17 2020 (r364227) @@ -29,6 +29,8 @@ CFLAGS+= -DLUA_PROGNAME="\"${PROG}\"" .if defined(BOOTSTRAPPING) CFLAGS+= -DLUA_PATH_DEFAULT="\"/nonexistent/?.lua\"" CFLAGS+= -DLUA_CPATH_DEFAULT="\"/nonexistent/?.so\"" +# We don't support dynamic libs on bootstrap builds. +CFLAGS+= -DBOOTSTRAPPING .endif .include <bsd.lib.mk> Modified: head/libexec/flua/Makefile ============================================================================== --- head/libexec/flua/Makefile Fri Aug 14 02:22:19 2020 (r364226) +++ head/libexec/flua/Makefile Fri Aug 14 02:40:17 2020 (r364227) @@ -31,9 +31,6 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008140240.07E2eIrt087573>