mirror of
https://github.com/PartialVolume/shredos.x86_64.git
synced 2026-02-20 17:42:10 +00:00
Upgrade buildroot to 2023.05 (from 2021.08.2), kernel is upgraded to 6.3 (from 5.13.19).
This commit is contained in:
@@ -6,7 +6,7 @@ Index: b/src/luaconf.h
|
||||
===================================================================
|
||||
--- a/src/luaconf.h
|
||||
+++ b/src/luaconf.h
|
||||
@@ -217,7 +217,7 @@
|
||||
@@ -223,7 +223,7 @@
|
||||
|
||||
#else /* }{ */
|
||||
|
||||
@@ -31,7 +31,7 @@ Index: b/src/Makefile
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -33,6 +33,7 @@
|
||||
PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
|
||||
PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris
|
||||
|
||||
LUA_A= liblua.a
|
||||
+LUA_SO= liblua.so
|
||||
@@ -8,7 +8,7 @@ Index: b/src/lua.c
|
||||
===================================================================
|
||||
--- a/src/lua.c
|
||||
+++ b/src/lua.c
|
||||
@@ -421,6 +421,14 @@
|
||||
@@ -438,6 +438,14 @@
|
||||
#define lua_saveline(L,line) ((void)L, add_history(line))
|
||||
#define lua_freeline(L,b) ((void)L, free(b))
|
||||
|
||||
5
package/lua/5.4.6/lua.hash
Normal file
5
package/lua/5.4.6/lua.hash
Normal file
@@ -0,0 +1,5 @@
|
||||
# Hashes from: https://www.lua.org/ftp/
|
||||
sha256 7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88 lua-5.4.6.tar.gz
|
||||
|
||||
# Locally computed
|
||||
sha256 8f1bff27c5b0585ab679dbe4e37e75a1014af0f79732f42a79f86728321a0c6d doc/readme.html
|
||||
@@ -14,13 +14,16 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER
|
||||
|
||||
choice
|
||||
prompt "Lua Version"
|
||||
default BR2_PACKAGE_LUA_5_3
|
||||
default BR2_PACKAGE_LUA_5_3 if BR2_PACKAGE_LUA_5_2 # legacy
|
||||
default BR2_PACKAGE_LUA_5_4
|
||||
help
|
||||
Select the version of Lua API/ABI you wish to use.
|
||||
|
||||
config BR2_PACKAGE_LUA_5_1
|
||||
bool "Lua 5.1.x"
|
||||
select BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1
|
||||
select BR2_PACKAGE_LUA_CVT_N2S
|
||||
select BR2_PACKAGE_LUA_CVT_S2N
|
||||
|
||||
config BR2_PACKAGE_LUA_5_3
|
||||
bool "Lua 5.3.x"
|
||||
@@ -43,6 +46,20 @@ config BR2_PACKAGE_LUA_32BITS
|
||||
|
||||
endif
|
||||
|
||||
config BR2_PACKAGE_LUA_CVT_N2S
|
||||
bool "automatic coercion from number to string"
|
||||
default y # legacy
|
||||
help
|
||||
If unsure, say y, this is the default behavior of the Lua
|
||||
interpreter. See LUA_NOCVTN2S in luaconf.h
|
||||
|
||||
config BR2_PACKAGE_LUA_CVT_S2N
|
||||
bool "automatic coercion from string to number"
|
||||
default y # legacy
|
||||
help
|
||||
If unsure, say y, this is the default behavior of the Lua
|
||||
interpreter. See LUA_NOCVTN2S in luaconf.h
|
||||
|
||||
choice
|
||||
prompt "Lua command-line editing"
|
||||
default BR2_PACKAGE_LUA_EDITING_NONE
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LUA_5_4),y)
|
||||
LUA_VERSION = 5.4.3
|
||||
LUA_VERSION = 5.4.6
|
||||
else ifeq ($(BR2_PACKAGE_LUA_5_3),y)
|
||||
LUA_VERSION = 5.3.6
|
||||
else
|
||||
@@ -31,6 +31,14 @@ else ifeq ($(BR2_PACKAGE_LUA_5_3),y)
|
||||
LUA_CFLAGS += -DLUA_COMPAT_5_2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LUA_CVT_N2S),)
|
||||
LUA_CFLAGS += -DLUA_NOCVTN2S
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LUA_CVT_S2N),)
|
||||
LUA_CFLAGS += -DLUA_NOCVTS2N
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
LUA_BUILDMODE = static
|
||||
else
|
||||
@@ -60,7 +68,7 @@ LUA_POST_PATCH_HOOKS += LUA_32BITS_LUACONF
|
||||
endif
|
||||
|
||||
define HOST_LUA_LUACONF
|
||||
$(SED) 's|#define LUA_ROOT.*|#define LUA_ROOT "$(HOST_DIR)/usr/"|' $(@D)/src/luaconf.h
|
||||
$(SED) 's|#define LUA_ROOT.*|#define LUA_ROOT "$(HOST_DIR)/"|' $(@D)/src/luaconf.h
|
||||
endef
|
||||
HOST_LUA_POST_PATCH_HOOKS += HOST_LUA_LUACONF
|
||||
|
||||
|
||||
Reference in New Issue
Block a user