git: 50da94fc7af1 - stable/12 - flua: initial support for "require" in the base system

[Kyle Evans]

The branch stable/12 has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=50da94fc7af1b3c515cf4648fc7e3a6c9794f682

commit 50da94fc7af1b3c515cf4648fc7e3a6c9794f682
Author:     Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2020-08-13 00:19:05 +0000
Commit:     Kyle Evans <kevans at FreeBSD.org>
CommitDate: 2021-01-24 03:43:19 +0000

    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.
    
    (cherry picked from commit bceabe277e1286ec694e34c186a73e7bf2c9de4f)
---
 etc/mtree/BSD.usr.dist | 4 ++++
 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 af85ef7647d5..68289fbb0544 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;" \