From 3cca5c85de43bb6d030ff7d9a653f8a6f281843d Mon Sep 17 00:00:00 2001
From: fritzkink <96341974+fritzkink@users.noreply.github.com>
Date: Sun, 08 Oct 2023 10:43:08 +0200
Subject: [PATCH] luajit - update to rolling version 2.1
---
/dev/null | 56 --------------
components/developer/luajit/Makefile | 44 +++++-----
components/developer/luajit/patches/luajit-02-src-Makefile.patch | 11 ++
components/developer/luajit/pkg5 | 3
components/developer/luajit/manifests/sample-manifest.p5m | 50 +++++++-----
components/developer/luajit/luajit.p5m | 52 +++++++------
6 files changed, 90 insertions(+), 126 deletions(-)
diff --git a/components/developer/luajit/Makefile b/components/developer/luajit/Makefile
index 0a814ef..a9a4e40 100644
--- a/components/developer/luajit/Makefile
+++ b/components/developer/luajit/Makefile
@@ -10,49 +10,49 @@
#
# Copyright 2016 Aurelien Larcher
+# Copyright 2023 Friedrich Kink
#
+
+BUILD_BITS= 64_and_32
+BUILD_STYLE= justmake
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= luajit
-COMPONENT_VERSION= 2.0.5
+COMPONENT_VERSION= 2.1.ROLLING
+HUMAN_VERSION= 2.1.0
COMPONENT_SUMMARY= LuaJIT - Just-In-Time Compiler (JIT) for the Lua programming language
COMPONENT_PROJECT_URL= http://luajit.org/
COMPONENT_FMRI= developer/luajit
COMPONENT_CLASSIFICATION= Development/Other Languages
COMPONENT_SRC_NAME= LuaJIT
COMPONENT_SRC= $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_URL= http://luajit.org/download/$(COMPONENT_ARCHIVE)
-COMPONENT_ARCHIVE_HASH= \
- sha256:874b1f8297c697821f561f9b73b57ffd419ed8f4278c82e05b48806d30c1e979
+COMPONENT_ARCHIVE= v$(COMPONENT_VERSION).tar.gz
+COMPONENT_ARCHIVE_URL= https://github.com/$(COMPONENT_SRC_NAME)/$(COMPONENT_SRC_NAME)/archive/refs/tags/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_HASH= sha256:31d7a4853df4c548bf91c13d3b690d19663d4c06ae952b62606c8225d0b410ad
COMPONENT_LICENSE= MIT
+COMPONENT_LICENSE_FILE= COPYRIGHT
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/justmake.mk
-include $(WS_MAKE_RULES)/ips.mk
-
-CFLAGS+= -fPIC
+include $(WS_MAKE_RULES)/common.mk
COMPONENT_BUILD_ARGS+= PREFIX=$(USRDIR)
COMPONENT_BUILD_ARGS+= CC=$(CC)
COMPONENT_BUILD_ARGS+= CFLAGS="$(CFLAGS)"
COMPONENT_BUILD_ARGS+= LDFLAGS="$(LDFLAGS)"
-COMPONENT_BUILD_ARGS+= MULTIBIN=bin/$(ARCHLIBSUBDIR)
-COMPONENT_BUILD_ARGS+= MULTILIB=lib/$(ARCHLIBSUBDIR)
+COMPONENT_BUILD_ARGS+= MULTIBIN=bin
+COMPONENT_BUILD_ARGS.32+= MULTILIB=lib
+COMPONENT_BUILD_ARGS.64+= MULTILIB=lib/$(MACH64)
COMPONENT_INSTALL_ARGS+= PREFIX=$(USRDIR)
COMPONENT_INSTALL_ARGS+= DESTDIR=$(PROTO_DIR)
-COMPONENT_INSTALL_ARGS+= MULTIBIN=bin/$(ARCHLIBSUBDIR)
-COMPONENT_INSTALL_ARGS+= MULTILIB=lib/$(ARCHLIBSUBDIR)
+COMPONENT_INSTALL_ARGS+= MULTIBIN=bin
+COMPONENT_INSTALL_ARGS.32+= MULTILIB=lib
+COMPONENT_INSTALL_ARGS.64+= MULTILIB=lib/$(MACH64)
-build: $(BUILD_32_and_64)
+TEST_TARGET= $(NO_TESTS)
-install: $(INSTALL_32_and_64)
-
-test: $(NO_TESTS)
-
-REQUIRED_PACKAGES += system/library
-REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG)
-REQUIRED_PACKAGES += system/library/math
REQUIRED_PACKAGES += runtime/lua
+# Auto-generated dependencies
+REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG)
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
diff --git a/components/developer/luajit/luajit.license b/components/developer/luajit/luajit.license
deleted file mode 100644
index 1ef7df6..0000000
--- a/components/developer/luajit/luajit.license
+++ /dev/null
@@ -1,56 +0,0 @@
-===============================================================================
-LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/
-
-Copyright (C) 2005-2015 Mike Pall. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-[ MIT license: http://www.opensource.org/licenses/mit-license.php ]
-
-===============================================================================
-[ LuaJIT includes code from Lua 5.1/5.2, which has this license statement: ]
-
-Copyright (C) 1994-2012 Lua.org, PUC-Rio.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-===============================================================================
-[ LuaJIT includes code from dlmalloc, which has this license statement: ]
-
-This is a version (aka dlmalloc) of malloc/free/realloc written by
-Doug Lea and released to the public domain, as explained at
-http://creativecommons.org/licenses/publicdomain
-
-===============================================================================
diff --git a/components/developer/luajit/luajit.p5m b/components/developer/luajit/luajit.p5m
index b38d484..de6c719 100644
--- a/components/developer/luajit/luajit.p5m
+++ b/components/developer/luajit/luajit.p5m
@@ -13,7 +13,8 @@
# Copyright 2016 Aurelien Larcher
#
-set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(HUMAN_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -22,29 +23,32 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
-link path=usr/bin/$(MACH64)/luajit target=luajit-$(COMPONENT_VERSION)
-file path=usr/bin/$(MACH64)/luajit-$(COMPONENT_VERSION)
-link path=usr/bin/luajit target=luajit-$(COMPONENT_VERSION)
-file path=usr/bin/luajit-$(COMPONENT_VERSION)
-file path=usr/include/luajit-2.0/lauxlib.h
-file path=usr/include/luajit-2.0/lua.h
-file path=usr/include/luajit-2.0/lua.hpp
-file path=usr/include/luajit-2.0/luaconf.h
-file path=usr/include/luajit-2.0/luajit.h
-file path=usr/include/luajit-2.0/lualib.h
+file path=usr/bin/luajit-2.1. target=usr/bin/luajit
+file path=usr/include/luajit-2.1/lauxlib.h
+file path=usr/include/luajit-2.1/lua.h
+file path=usr/include/luajit-2.1/lua.hpp
+file path=usr/include/luajit-2.1/luaconf.h
+file path=usr/include/luajit-2.1/luajit.h
+file path=usr/include/luajit-2.1/lualib.h
file path=usr/lib/$(MACH64)/libluajit-5.1.a
file path=usr/lib/$(MACH64)/pkgconfig/luajit.pc
-file path=usr/lib/libluajit-5.1.a
-file path=usr/lib/pkgconfig/luajit.pc
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/bc.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/bcsave.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/dis_arm.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/dis_mips.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/dis_mipsel.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/dis_ppc.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/dis_x64.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/dis_x86.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/dump.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/v.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/vmdef.lua
+file path=usr/share/luajit-2.1/jit/bc.lua
+file path=usr/share/luajit-2.1/jit/bcsave.lua
+file path=usr/share/luajit-2.1/jit/dis_arm.lua
+file path=usr/share/luajit-2.1/jit/dis_arm64.lua
+file path=usr/share/luajit-2.1/jit/dis_arm64be.lua
+file path=usr/share/luajit-2.1/jit/dis_mips.lua
+file path=usr/share/luajit-2.1/jit/dis_mips64.lua
+file path=usr/share/luajit-2.1/jit/dis_mips64el.lua
+file path=usr/share/luajit-2.1/jit/dis_mips64r6.lua
+file path=usr/share/luajit-2.1/jit/dis_mips64r6el.lua
+file path=usr/share/luajit-2.1/jit/dis_mipsel.lua
+file path=usr/share/luajit-2.1/jit/dis_ppc.lua
+file path=usr/share/luajit-2.1/jit/dis_x64.lua
+file path=usr/share/luajit-2.1/jit/dis_x86.lua
+file path=usr/share/luajit-2.1/jit/dump.lua
+file path=usr/share/luajit-2.1/jit/p.lua
+file path=usr/share/luajit-2.1/jit/v.lua
+file path=usr/share/luajit-2.1/jit/vmdef.lua
+file path=usr/share/luajit-2.1/jit/zone.lua
file path=usr/share/man/man1/luajit.1
diff --git a/components/developer/luajit/manifests/sample-manifest.p5m b/components/developer/luajit/manifests/sample-manifest.p5m
index 9a9df12..af06e4d 100644
--- a/components/developer/luajit/manifests/sample-manifest.p5m
+++ b/components/developer/luajit/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
-# Copyright 2016 <contributor>
+# Copyright 2023 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -22,29 +23,34 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
-link path=usr/bin/$(MACH64)/luajit target=luajit-$(COMPONENT_VERSION)
-file path=usr/bin/$(MACH64)/luajit-$(COMPONENT_VERSION)
-link path=usr/bin/luajit target=luajit-$(COMPONENT_VERSION)
-file path=usr/bin/luajit-$(COMPONENT_VERSION)
-file path=usr/include/luajit-2.0/lauxlib.h
-file path=usr/include/luajit-2.0/lua.h
-file path=usr/include/luajit-2.0/lua.hpp
-file path=usr/include/luajit-2.0/luaconf.h
-file path=usr/include/luajit-2.0/luajit.h
-file path=usr/include/luajit-2.0/lualib.h
+file path=usr/bin/luajit-2.1.
+file path=usr/include/luajit-2.1/lauxlib.h
+file path=usr/include/luajit-2.1/lua.h
+file path=usr/include/luajit-2.1/lua.hpp
+file path=usr/include/luajit-2.1/luaconf.h
+file path=usr/include/luajit-2.1/luajit.h
+file path=usr/include/luajit-2.1/lualib.h
file path=usr/lib/$(MACH64)/libluajit-5.1.a
file path=usr/lib/$(MACH64)/pkgconfig/luajit.pc
file path=usr/lib/libluajit-5.1.a
file path=usr/lib/pkgconfig/luajit.pc
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/bc.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/bcsave.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/dis_arm.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/dis_mips.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/dis_mipsel.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/dis_ppc.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/dis_x64.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/dis_x86.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/dump.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/v.lua
-file path=usr/share/luajit-$(COMPONENT_VERSION)/jit/vmdef.lua
+file path=usr/share/luajit-2.1/jit/bc.lua
+file path=usr/share/luajit-2.1/jit/bcsave.lua
+file path=usr/share/luajit-2.1/jit/dis_arm.lua
+file path=usr/share/luajit-2.1/jit/dis_arm64.lua
+file path=usr/share/luajit-2.1/jit/dis_arm64be.lua
+file path=usr/share/luajit-2.1/jit/dis_mips.lua
+file path=usr/share/luajit-2.1/jit/dis_mips64.lua
+file path=usr/share/luajit-2.1/jit/dis_mips64el.lua
+file path=usr/share/luajit-2.1/jit/dis_mips64r6.lua
+file path=usr/share/luajit-2.1/jit/dis_mips64r6el.lua
+file path=usr/share/luajit-2.1/jit/dis_mipsel.lua
+file path=usr/share/luajit-2.1/jit/dis_ppc.lua
+file path=usr/share/luajit-2.1/jit/dis_x64.lua
+file path=usr/share/luajit-2.1/jit/dis_x86.lua
+file path=usr/share/luajit-2.1/jit/dump.lua
+file path=usr/share/luajit-2.1/jit/p.lua
+file path=usr/share/luajit-2.1/jit/v.lua
+file path=usr/share/luajit-2.1/jit/vmdef.lua
+file path=usr/share/luajit-2.1/jit/zone.lua
file path=usr/share/man/man1/luajit.1
diff --git a/components/developer/luajit/patches/luajit-02-src-Makefile.patch b/components/developer/luajit/patches/luajit-02-src-Makefile.patch
new file mode 100644
index 0000000..c06e589
--- /dev/null
+++ b/components/developer/luajit/patches/luajit-02-src-Makefile.patch
@@ -0,0 +1,11 @@
+--- LuaJIT-2.1.ROLLING/src/Makefile 2023-08-21 03:18:35.000000000 +0200
++++ LuaJIT-2.1.ROLLING/src/Makefile.new 2023-10-07 21:29:09.518759796 +0200
+@@ -223,7 +223,7 @@
+ TARGET_DYNXLDOPTS=
+
+ TARGET_LFSFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+-TARGET_XCFLAGS= $(TARGET_LFSFLAGS) -U_FORTIFY_SOURCE
++TARGET_XCFLAGS= $(TARGET_LFSFLAGS) -U_FORTIFY_SOURCE -funwind-tables -DLUAJIT_UNWIND_EXTERNAL -fpic
+ TARGET_XLDFLAGS=
+ TARGET_XLIBS= -lm
+ TARGET_TCFLAGS= $(CCOPTIONS) $(TARGET_XCFLAGS) $(TARGET_FLAGS) $(TARGET_CFLAGS)
diff --git a/components/developer/luajit/pkg5 b/components/developer/luajit/pkg5
index ccacf5b..c1b1cca 100644
--- a/components/developer/luajit/pkg5
+++ b/components/developer/luajit/pkg5
@@ -1,9 +1,8 @@
{
"dependencies": [
- "SUNWcs",
"runtime/lua",
"system/library",
- "system/library/gcc-7-runtime",
+ "system/library/gcc-10-runtime",
"system/library/math"
],
"fmris": [
--
Gitblit v1.9.3