package/luajit: switch to moonjit fork

This fork is based on LuaJIT 2.1.0-beta3 which supports ARM64.

The license file is changed with the copyright from the Moonjit
developers, and an additional copy of the MIT license. Therefore the
license terms are still the same: MIT.

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
[Thomas: add details about why the hash of the license file changes]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Francois Perrad 2019-12-04 09:38:45 +01:00 committed by Thomas Petazzoni
parent a7d117a7b8
commit 2ca0accc21
5 changed files with 10 additions and 11 deletions

View File

@ -6,7 +6,7 @@ Index: b/Makefile
=================================================================== ===================================================================
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -43,8 +43,7 @@ @@ -44,8 +44,7 @@
INSTALL_MAN= $(INSTALL_SHARE)/man/man1 INSTALL_MAN= $(INSTALL_SHARE)/man/man1
INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
@ -16,7 +16,7 @@ Index: b/Makefile
INSTALL_ANAME= libluajit-$(ABIVER).a INSTALL_ANAME= libluajit-$(ABIVER).a
INSTALL_SOSHORT1= libluajit-$(ABIVER).so INSTALL_SOSHORT1= libluajit-$(ABIVER).so
INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER) INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER)
@@ -59,7 +58,6 @@ @@ -60,7 +59,6 @@
INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT1) INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT1)
INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT2) INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT2)
INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)

View File

@ -6,7 +6,7 @@ Index: b/Makefile
=================================================================== ===================================================================
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -32,7 +32,7 @@ @@ -33,7 +33,7 @@
INSTALL_BIN= $(DPREFIX)/bin INSTALL_BIN= $(DPREFIX)/bin
INSTALL_LIB= $(DPREFIX)/$(MULTILIB) INSTALL_LIB= $(DPREFIX)/$(MULTILIB)
INSTALL_SHARE= $(DPREFIX)/share INSTALL_SHARE= $(DPREFIX)/share

View File

@ -2,7 +2,7 @@ config BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
bool bool
default y if BR2_i386 || \ default y if BR2_i386 || \
(BR2_x86_64 && BR2_HOSTARCH='x86_64') || \ (BR2_x86_64 && BR2_HOSTARCH='x86_64') || \
BR2_powerpc || BR2_arm || BR2_armeb || \ BR2_powerpc || BR2_arm || BR2_armeb || BR2_aarch64 || \
((BR2_mips || BR2_mipsel) && !BR2_MIPS_SOFT_FLOAT && \ ((BR2_mips || BR2_mipsel) && !BR2_MIPS_SOFT_FLOAT && \
!BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6) !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6)
# -m32 flag is used for 32bit builds and host-luajit has # -m32 flag is used for 32bit builds and host-luajit has
@ -26,7 +26,7 @@ config BR2_PACKAGE_LUAJIT
ABI-compatible to the standard Lua interpreter and can be ABI-compatible to the standard Lua interpreter and can be
deployed as a drop-in replacement. deployed as a drop-in replacement.
http://luajit.org/ https://github.com/moonjit/moonjit
if BR2_PACKAGE_LUAJIT if BR2_PACKAGE_LUAJIT

View File

@ -1,5 +1,5 @@
# Hashes from: http://luajit.org/download.html # Locally calculated
md5 48353202cbcacab84ee41a5a70ea0a2c LuaJIT-2.0.5.tar.gz sha256 c3de8e29aa617fc594c043f57636ab9ad71af2b4a3a513932b05f5cdaa4320b2 luajit-2.1.2.tar.gz
# Locally calculated # Locally calculated
sha256 accb335aa3102f80d31caa2c2508fbcb795314106493519a367f13a87d0e87de COPYRIGHT sha256 aa64a7706ded773011b933f4230d7b35ba662598197f82ac2c7bca62abdaa4d7 COPYRIGHT

View File

@ -4,9 +4,8 @@
# #
################################################################################ ################################################################################
LUAJIT_VERSION = 2.0.5 LUAJIT_VERSION = 2.1.2
LUAJIT_SOURCE = LuaJIT-$(LUAJIT_VERSION).tar.gz LUAJIT_SITE = $(call github,moonjit,moonjit,$(LUAJIT_VERSION))
LUAJIT_SITE = http://luajit.org/download
LUAJIT_LICENSE = MIT LUAJIT_LICENSE = MIT
LUAJIT_LICENSE_FILES = COPYRIGHT LUAJIT_LICENSE_FILES = COPYRIGHT