svn commit: r364182 - in head: etc/mtree lib/liblua

[Ed Maste]

Author: emaste
Date: Thu Aug 13 00:19:05 2020
New Revision: 364182
URL: https://svnweb.freebsd.org/changeset/base/364182

Log:
  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

Modified:
  head/etc/mtree/BSD.usr.dist
  head/lib/liblua/luaconf.h

Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist	Wed Aug 12 20:33:29 2020	(r364181)
+++ head/etc/mtree/BSD.usr.dist	Thu Aug 13 00:19:05 2020	(r364182)
@@ -68,6 +68,8 @@
         ..
         engines
         ..
+        flua
+        ..
         i18n
         ..
         libxo
@@ -369,6 +371,8 @@
             ..
         ..
         firmware
+        ..
+        flua
         ..
         games
             fortune

Modified: head/lib/liblua/luaconf.h
==============================================================================
--- head/lib/liblua/luaconf.h	Wed Aug 12 20:33:29 2020	(r364181)
+++ head/lib/liblua/luaconf.h	Thu Aug 13 00:19:05 2020	(r364182)
@@ -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;" \