d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flua: initial support for "require" in the base system

Browse Source 
Use /usr not /usr/local for base system components.

Use /usr/lib/flua and /usr/share/flua (not lua) for consistency and to
avoid the possibility that other software accidentally finds our base
system modules.

Also drop the version from the path, as flua represents an unspecified
lua version that corresponds to the FreeBSD version it comes with.

LUA_USE_DLOPEN is not yet enabled because some additional changes are
needed wrt symbol visibility.

Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D24605
This commit is contained in:
Ed Maste 2020-08-13 00:19:05 +00:00
parent 40db51b42f
commit bceabe277e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/mtree/BSD.usr.dist
View File

@ -68,6 +68,8 @@
..
engines
..
flua
..
i18n
..
libxo
@ -370,6 +372,8 @@
..
firmware
..
flua
..
games
fortune
..

6
lib/liblua/luaconf.h
View File

@ -205,9 +205,9 @@
#else /* }{ */
#define LUA_ROOT "/usr/local/"
#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"
#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"
#define LUA_ROOT "/usr/"
#define LUA_LDIR LUA_ROOT "share/flua/"
#define LUA_CDIR LUA_ROOT "lib/flua/"
#if !defined(LUA_PATH_DEFAULT)
#define LUA_PATH_DEFAULT \
LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \