diff options
author | Ed Maste <emaste@FreeBSD.org> | 2020-08-13 00:19:05 +0000 |
---|---|---|
committer | Ed Maste <emaste@FreeBSD.org> | 2020-08-13 00:19:05 +0000 |
commit | bceabe277e1286ec694e34c186a73e7bf2c9de4f (patch) | |
tree | 276546db60c85a0ed856eead7d110872c2357621 | |
parent | 40db51b42fe39e335c1c4d5abcc7f1adf862356e (diff) | |
download | src-bceabe277e1286ec694e34c186a73e7bf2c9de4f.tar.gz src-bceabe277e1286ec694e34c186a73e7bf2c9de4f.zip |
flua: initial support for "require" in the base system
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
Notes
Notes:
svn path=/head/; revision=364182
-rw-r--r-- | etc/mtree/BSD.usr.dist | 4 | ||||
-rw-r--r-- | lib/liblua/luaconf.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index e3164c7d76ba..bf51fd5718cb 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -68,6 +68,8 @@ .. engines .. + flua + .. i18n .. libxo @@ -370,6 +372,8 @@ .. firmware .. + flua + .. games fortune .. diff --git a/lib/liblua/luaconf.h b/lib/liblua/luaconf.h index b24645b8915f..db6f3222f101 100644 --- a/lib/liblua/luaconf.h +++ b/lib/liblua/luaconf.h @@ -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;" \ |