From d003d58fee3baa76e47678458a428953ffd865c1 Mon Sep 17 00:00:00 2001
From: extrowerk <5569059+extrowerk@users.noreply.github.com>
Date: Thu, 26 May 2022 08:30:26 +0200
Subject: [PATCH] lua: bump (#6707)

* lua: bump

* Solution-proposal
---
 .../{lua-5.3.5.recipe => lua-5.3.6.recipe}    |  2 +-
 ...{lua54-5.4.1.recipe => lua54-5.4.4.recipe} | 15 +++++++++-----
 ....gcc2.patchset => lua-5.3.6.gcc2.patchset} |  0
 ...{lua-5.3.5.patchset => lua-5.3.6.patchset} |  0
 ...cc2.patchset => lua54-5.4.4.gcc2.patchset} | 17 ++--------------
 ...54-5.4.1.patchset => lua54-5.4.4.patchset} | 20 +++++++++----------
 6 files changed, 23 insertions(+), 31 deletions(-)
 rename dev-lang/lua/{lua-5.3.5.recipe => lua-5.3.6.recipe} (97%)
 rename dev-lang/lua/{lua54-5.4.1.recipe => lua54-5.4.4.recipe} (89%)
 rename dev-lang/lua/patches/{lua-5.3.5.gcc2.patchset => lua-5.3.6.gcc2.patchset} (100%)
 rename dev-lang/lua/patches/{lua-5.3.5.patchset => lua-5.3.6.patchset} (100%)
 rename dev-lang/lua/patches/{lua54-5.4.1.gcc2.patchset => lua54-5.4.4.gcc2.patchset} (59%)
 rename dev-lang/lua/patches/{lua54-5.4.1.patchset => lua54-5.4.4.patchset} (91%)

diff --git a/dev-lang/lua/lua-5.3.5.recipe b/dev-lang/lua/lua-5.3.6.recipe
similarity index 97%
rename from dev-lang/lua/lua-5.3.5.recipe
rename to dev-lang/lua/lua-5.3.6.recipe
index 74b12db1a..d088aa77f 100644
--- a/dev-lang/lua/lua-5.3.5.recipe
+++ b/dev-lang/lua/lua-5.3.6.recipe
@@ -10,7 +10,7 @@ Figueiredo"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="https://www.lua.org/ftp/lua-$portVersion.tar.gz"
-CHECKSUM_SHA256="0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac"
+CHECKSUM_SHA256="fc5fd69bb8736323f026672b1b7235da613d7177e72558893a0bdcd320466d60"
 PATCHES="lua-$portVersion.patchset"
 if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
 	PATCHES+="
diff --git a/dev-lang/lua/lua54-5.4.1.recipe b/dev-lang/lua/lua54-5.4.4.recipe
similarity index 89%
rename from dev-lang/lua/lua54-5.4.1.recipe
rename to dev-lang/lua/lua54-5.4.4.recipe
index d6aebd594..fff1a2e6a 100644
--- a/dev-lang/lua/lua54-5.4.1.recipe
+++ b/dev-lang/lua/lua54-5.4.4.recipe
@@ -10,7 +10,7 @@ COPYRIGHT="1994-2020 Lua.org, PUC-Rio"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="http://www.lua.org/ftp/lua-$portVersion.tar.gz"
-CHECKSUM_SHA256="4ba786c3705eb9db6567af29c91a01b81f1c0ac3124fdbf6cd94bdd9e53cca7d"
+CHECKSUM_SHA256="164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61"
 SOURCE_DIR="lua-$portVersion"
 PATCHES="lua54-$portVersion.patchset"
 if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
@@ -19,8 +19,8 @@ if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
 	"
 fi
 
-ARCHITECTURES="?all"
-SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+ARCHITECTURES="all"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 libVersion="${portVersion%.*}"
 libVersionCompat="$libVersion compat >= $libVersion"
@@ -60,8 +60,13 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	make haiku MYCFLAGS="-DLUA_ROOT='\"$prefix/\"' -DLUA_LDIR='\"$dataDir/lua/$libVersion/\"'" \
-		LUA_T="lua$libVersion" LUAC_T="luac$libVersion" LUA_SO="liblua.so.$libVersion"
+if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
+	GCC2_CFLAG="-DLUA_NOBUILTIN=1"
+fi
+
+	make haiku MYCFLAGS="-DLUA_ROOT='\"$prefix/\"' -DLUA_LDIR='\"$dataDir/lua/$libVersion/\"' \
+		$GCC2_CFLAG" LUA_T="lua$libVersion" LUAC_T="luac$libVersion" \
+		LUA_SO="liblua.so.$libVersion"
 }
 
 INSTALL()
diff --git a/dev-lang/lua/patches/lua-5.3.5.gcc2.patchset b/dev-lang/lua/patches/lua-5.3.6.gcc2.patchset
similarity index 100%
rename from dev-lang/lua/patches/lua-5.3.5.gcc2.patchset
rename to dev-lang/lua/patches/lua-5.3.6.gcc2.patchset
diff --git a/dev-lang/lua/patches/lua-5.3.5.patchset b/dev-lang/lua/patches/lua-5.3.6.patchset
similarity index 100%
rename from dev-lang/lua/patches/lua-5.3.5.patchset
rename to dev-lang/lua/patches/lua-5.3.6.patchset
diff --git a/dev-lang/lua/patches/lua54-5.4.1.gcc2.patchset b/dev-lang/lua/patches/lua54-5.4.4.gcc2.patchset
similarity index 59%
rename from dev-lang/lua/patches/lua54-5.4.1.gcc2.patchset
rename to dev-lang/lua/patches/lua54-5.4.4.gcc2.patchset
index 662691d9b..c7f16576c 100644
--- a/dev-lang/lua/patches/lua54-5.4.1.gcc2.patchset
+++ b/dev-lang/lua/patches/lua54-5.4.4.gcc2.patchset
@@ -5,7 +5,7 @@ Subject: gcc2 patch
 
 
 diff --git a/src/Makefile b/src/Makefile
-index 5f25dd1..d030639 100644
+index 113ccf3..23eba9d 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -6,8 +6,8 @@
@@ -19,19 +19,6 @@ index 5f25dd1..d030639 100644
  LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
  LIBS= -lm $(SYSLIBS) $(MYLIBS)
  
-diff --git a/src/llimits.h b/src/llimits.h
-index 48c97f9..419f426 100644
---- a/src/llimits.h
-+++ b/src/llimits.h
-@@ -154,7 +154,7 @@ typedef LUAI_UACINT l_uacInt;
- */
- #if !defined(likely)
- 
--#if defined(__GNUC__)
-+#if defined(__GNUC__)  > 3
- #define likely(x)	(__builtin_expect(((x) != 0), 1))
- #define unlikely(x)	(__builtin_expect(((x) != 0), 0))
- #else
 -- 
-2.28.0
+2.30.2
 
diff --git a/dev-lang/lua/patches/lua54-5.4.1.patchset b/dev-lang/lua/patches/lua54-5.4.4.patchset
similarity index 91%
rename from dev-lang/lua/patches/lua54-5.4.1.patchset
rename to dev-lang/lua/patches/lua54-5.4.4.patchset
index 9c64c0d90..cd24c076d 100644
--- a/dev-lang/lua/patches/lua54-5.4.1.patchset
+++ b/dev-lang/lua/patches/lua54-5.4.4.patchset
@@ -5,7 +5,7 @@ Subject: import patch from 5.2.1
 
 
 diff --git a/Makefile b/Makefile
-index 1797df9..d93b0bc 100644
+index fef1af4..b1a567e 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -36,12 +36,12 @@ RM= rm -f
@@ -23,7 +23,7 @@ index 1797df9..d93b0bc 100644
  TO_MAN= lua.1 luac.1
  
  # Lua version and release.
-@@ -52,7 +52,7 @@ R= $V.1
+@@ -52,7 +52,7 @@ R= $V.4
  all:	$(PLAT)
  
  $(PLATS) help test clean:
@@ -33,10 +33,10 @@ index 1797df9..d93b0bc 100644
  install: dummy
  	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
 diff --git a/src/Makefile b/src/Makefile
-index 514593d..5f25dd1 100644
+index 1907381..113ccf3 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -30,9 +30,10 @@ CMCFLAGS= -Os
+@@ -30,9 +30,10 @@ CMCFLAGS=
  
  # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
  
@@ -65,9 +65,9 @@ index 514593d..5f25dd1 100644
 +	$(CC) -o $@ -shared -fPIC -Wl,-soname=liblua.so.$(V) $(LDFLAGS) $? $(LIBS)
 +
  test:
- 	./lua -v
+ 	./$(LUA_T) -v
  
-@@ -115,6 +119,9 @@ FreeBSD NetBSD OpenBSD freebsd:
+@@ -117,6 +121,9 @@ FreeBSD NetBSD OpenBSD freebsd:
  
  generic: $(ALL)
  
@@ -78,10 +78,10 @@ index 514593d..5f25dd1 100644
  
  linux-noreadline:
 diff --git a/src/luaconf.h b/src/luaconf.h
-index bdf927e..f583e1d 100644
+index d42d14b..c388109 100644
 --- a/src/luaconf.h
 +++ b/src/luaconf.h
-@@ -84,6 +84,12 @@
+@@ -69,6 +69,12 @@
  #define LUA_USE_DLOPEN		/* MacOS does not need -ldl */
  #endif
  
@@ -94,7 +94,7 @@ index bdf927e..f583e1d 100644
  
  /*
  @@ LUAI_IS32INT is true iff 'int' has (at least) 32 bits.
-@@ -227,8 +233,12 @@
+@@ -217,8 +223,12 @@
  
  #else			/* }{ */
  
@@ -108,5 +108,5 @@ index bdf927e..f583e1d 100644
  
  #if !defined(LUA_PATH_DEFAULT)
 -- 
-2.28.0
+2.30.2