haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

lua 5.4, bump version (#5316)

Browse Source
This commit is contained in:
Schrijvers Luc
2020-12-19 07:42:09 +01:00
committed by GitHub
parent 34e34694a2
commit b7f997dbcc
3 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dev-lang/lua/lua54-5.4.0~beta.recipe → dev-lang/lua/lua54-5.4.1.recipe
View File

@@ -6,16 +6,16 @@ virtual machine, and has automatic memory management with incremental garbage \
collection, making it ideal for configuration, scripting, and rapid \
prototyping."
HOMEPAGE="https://www.lua.org/"
COPYRIGHT="1994-2019 Lua.org, PUC-Rio"
COPYRIGHT="1994-2020 Lua.org, PUC-Rio"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="http://www.lua.org/work/lua-${portVersion/\~beta/-beta}.tar.gz"
CHECKSUM_SHA256="5eb2824bc08469be9d9282c7298f001830ea013179ad0ae8a50600332568ebb9"
SOURCE_DIR="lua-${portVersion/\~beta/-beta}"
PATCHES="lua-$portVersion.patchset"
SOURCE_URI="http://www.lua.org/ftp/lua-$portVersion.tar.gz"
CHECKSUM_SHA256="4ba786c3705eb9db6567af29c91a01b81f1c0ac3124fdbf6cd94bdd9e53cca7d"
SOURCE_DIR="lua-$portVersion"
PATCHES="lua54-$portVersion.patchset"
if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
PATCHES+="
lua-$portVersion.gcc2.patchset
lua54-$portVersion.gcc2.patchset
"
fi
@@ -28,11 +28,11 @@ luaInc="`echo ${libVersion} | tr -d '.'`"
luaVer="`echo $portVersion | cut -d~ -f1`"
PROVIDES="
lua54$secondaryArchSuffix = $portVersion
cmd:lua$secondaryArchSuffix = $portVersion
cmd:lua$libVersion$secondaryArchSuffix = $portVersion
cmd:luac$secondaryArchSuffix = $portVersion
cmd:luac$libVersion$secondaryArchSuffix = $portVersion
lua54$secondaryArchSuffix = $portVersion compat >= 5.4
cmd:lua$secondaryArchSuffix = $portVersion compat >= 5.4
cmd:lua$libVersion$secondaryArchSuffix = $portVersion compat >= 5.4
cmd:luac$secondaryArchSuffix = $portVersion compat >= 5.4
cmd:luac$libVersion$secondaryArchSuffix = $portVersion compat >= 5.4
lib:liblua$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
@@ -40,7 +40,7 @@ REQUIRES="
"
PROVIDES_devel="
lua54${secondaryArchSuffix}_devel = $portVersion
lua54${secondaryArchSuffix}_devel = $portVersion compat >= 5.4
devel:liblua$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="

14
dev-lang/lua/patches/lua-5.4.0~beta.gcc2.patchset → dev-lang/lua/patches/lua54-5.4.1.gcc2.patchset
View File

@@ -1,16 +1,16 @@
From 0fe2f71f6eb7fb099b4ad950b50e2f27d919ea67 Mon Sep 17 00:00:00 2001
From ca5ede929cd286ccc31742468787ed2f43927548 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 11 Aug 2015 17:13:15 +0000
Subject: gcc2 patch
diff --git a/src/Makefile b/src/Makefile
index d0c4194..f5491cf 100644
index 5f25dd1..d030639 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,8 +6,8 @@
# Your platform. See PLATS for possible values.
PLAT= none
PLAT= guess
-CC= gcc -std=gnu99
-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)
@@ -20,18 +20,18 @@ index d0c4194..f5491cf 100644
LIBS= -lm $(SYSLIBS) $(MYLIBS)
diff --git a/src/llimits.h b/src/llimits.h
index 2b52c83..ddbc51a 100644
index 48c97f9..419f426 100644
--- a/src/llimits.h
+++ b/src/llimits.h
@@ -146,7 +146,7 @@ typedef LUAI_UACINT l_uacInt;
@@ -154,7 +154,7 @@ typedef LUAI_UACINT l_uacInt;
*/
#if !defined(likely)
-#if defined(__GNUC__)
+#if defined(__GNUC__) > 3
+#if defined(__GNUC__) > 3
#define likely(x) (__builtin_expect(((x) != 0), 1))
#define unlikely(x) (__builtin_expect(((x) != 0), 0))
#else
--
2.23.0
2.28.0

44
dev-lang/lua/patches/lua-5.4.0~beta.patchset → dev-lang/lua/patches/lua54-5.4.1.patchset
View File

@@ -1,54 +1,54 @@
From cb6d6fae1c5deb2efa132697cdd9cf00d727d129 Mon Sep 17 00:00:00 2001
From 0bc7efaa7e1e79f5753116d881b4ea30b1cc0fd0 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 5 May 2014 15:59:15 +0000
Subject: import patch from 5.2.1
diff --git a/Makefile b/Makefile
index 8460e80..79f2e6d 100644
index 1797df9..d93b0bc 100644
--- a/Makefile
+++ b/Makefile
@@ -36,12 +36,12 @@ RM= rm -f
# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
# Convenience platforms targets.
-PLATS= aix bsd c89 freebsd generic guess linux linux-readline macosx mingw posix solaris
+PLATS= aix bsd c89 freebsd generic guess haiku linux linux-readline macosx mingw posix solaris
-PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
+PLATS= guess aix bsd c89 freebsd generic haiku linux linux-readline macosx mingw posix solaris
# What to install.
TO_BIN= lua luac
TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
-TO_LIB= liblua.a
+TO_LIB= liblua.a liblusa.so
+TO_LIB= liblua.a liblua.so
TO_MAN= lua.1 luac.1
# Lua version and release.
@@ -52,7 +52,7 @@ R= $V.0
@@ -52,7 +52,7 @@ R= $V.1
all: $(PLAT)
$(PLATS) clean:
- cd src && $(MAKE) $@
+ cd src && $(MAKE) V=$(V) $@
$(PLATS) help test clean:
- @cd src && $(MAKE) $@
+ @cd src && $(MAKE) V=$(V) $@
test: dummy
src/lua -v
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 8dee54c..d0c4194 100644
index 514593d..5f25dd1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -26,9 +26,10 @@ MYOBJS=
@@ -30,9 +30,10 @@ CMCFLAGS= -Os
# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
-PLATS= aix bsd c89 freebsd generic guess linux linux-readline macosx mingw posix solaris
+PLATS= aix bsd c89 freebsd generic guess haiku linux linux-readline macosx mingw posix solaris
-PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
+PLATS= guess aix bsd c89 freebsd generic haiku linux linux-readline macosx mingw posix solaris
LUA_A= liblua.a
+LUA_SO= liblua.so
CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o
LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
@@ -40,7 +41,7 @@ LUAC_T= luac
@@ -44,7 +45,7 @@ LUAC_T= luac
LUAC_O= luac.o
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
@@ -57,17 +57,17 @@ index 8dee54c..d0c4194 100644
ALL_A= $(LUA_A)
# Targets start here.
@@ -62,6 +63,9 @@ $(LUA_T): $(LUA_O) $(LUA_A)
@@ -66,6 +67,9 @@ $(LUA_T): $(LUA_O) $(LUA_A)
$(LUAC_T): $(LUAC_O) $(LUA_A)
$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+$(LUA_SO): $(CORE_O) $(LIB_O)
+ $(CC) -o $@ -shared -fPIC -Wl,-soname=liblua.so.$(V) $(LDFLAGS) $? $(LIBS)
+
clean:
$(RM) $(ALL_T) $(ALL_O)
test:
./lua -v
@@ -106,6 +110,9 @@ FreeBSD NetBSD OpenBSD freebsd:
@@ -115,6 +119,9 @@ FreeBSD NetBSD OpenBSD freebsd:
generic: $(ALL)
@@ -78,7 +78,7 @@ index 8dee54c..d0c4194 100644
linux-noreadline:
diff --git a/src/luaconf.h b/src/luaconf.h
index 8f13743..4235d0c 100644
index bdf927e..f583e1d 100644
--- a/src/luaconf.h
+++ b/src/luaconf.h
@@ -84,6 +84,12 @@
@@ -108,5 +108,5 @@ index 8f13743..4235d0c 100644
#if !defined(LUA_PATH_DEFAULT)
--
2.23.0
2.28.0