Mon May 29 21:47:31 2017 UTC ()
Update LuaJIT2 to 2.0.5.

LuaJIT 2.0.5 -- 2017-05-01

     * Add workaround for MSVC 2015 stdio changes.
     * Limit mcode alloc probing, depending on the available pool size.
     * Fix overly restrictive range calculation in mcode allocation.
     * Fix out-of-scope goto handling in parser.
     * Remove internal __mode = "K" and replace with safe check.
     * Add "proto" field to jit.util.funcinfo().
     * Fix GC step size calculation.
     * Initialize uv->immutable for upvalues of loaded chunks.
     * Fix for cdata vs. non-cdata arithmetics/comparisons.
     * Drop leftover regs in 'for' iterator assignment, too.
     * Fix PHI remarking in SINK pass.
     * Don't try to record outermost pcall() return to lower frame.
     * Add guard for obscure aliasing between open upvalues and SSA slots.
     * Remove assumption that lj_math_random_step() doesn't clobber FPRs.
     * Fix handling of non-numeric strings in arithmetic coercions.
     * Fix recording of select(n, ...) with off-trace varargs
     * Fix install for cross-builds.
     * Don't allocate unused 2nd result register in JIT compiler backend.
     * Drop marks from replayed instructions when sinking.
     * Fix unsinking check.
     * Properly handle OOM in trace_save().
     * Limit number of arguments given to io.lines() and fp:lines().
     * Fix narrowing of TOBIT.
     * OSX: Fix build with recent XCode.
     * x86/x64: Don't spill an explicit REF_BASE in the IR.
     * x86/x64: Fix instruction length decoder.
     * x86/x64: Search for exit jumps with instruction length decoder.
     * ARM: Fix BLX encoding for Thumb interworking calls.
     * MIPS: Don't use RID_GP as a scratch register.
     * MIPS: Fix emitted code for U32 to float conversion.
     * MIPS: Backport workaround for compact unwind tables.
     * MIPS: Fix cross-endian jit.bcsave.
     * MIPS: Fix BC_ISNEXT fallback path.
     * MIPS: Fix use of ffgccheck delay slots in interpreter.
     * FFI: Fix FOLD rules for int64_t comparisons.
     * FFI: Fix SPLIT pass for CONV i64.u64.
     * FFI: Fix ipairs() recording.
     * FFI: Don't propagate qualifiers into subtypes of complex.


(alnsn)
diff -r1.9 -r1.10 pkgsrc/lang/LuaJIT2/Makefile
diff -r1.8 -r1.9 pkgsrc/lang/LuaJIT2/distinfo
diff -r1.5 -r1.6 pkgsrc/lang/LuaJIT2/patches/patch-Makefile
diff -r1.1 -r1.2 pkgsrc/lang/LuaJIT2/patches/patch-src_Makefile

cvs diff -r1.9 -r1.10 pkgsrc/lang/LuaJIT2/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/LuaJIT2/Makefile 2016/08/21 21:34:57 1.9
+++ pkgsrc/lang/LuaJIT2/Makefile 2017/05/29 21:47:31 1.10
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.9 2016/08/21 21:34:57 alnsn Exp $ 1# $NetBSD: Makefile,v 1.10 2017/05/29 21:47:31 alnsn Exp $
2# 2#
3 3
4DISTNAME= LuaJIT-2.0.4 4DISTNAME= LuaJIT-2.0.5
5PKGNAME= ${DISTNAME:S/LuaJIT/LuaJIT2/} 5PKGNAME= ${DISTNAME:S/LuaJIT/LuaJIT2/}
6PKGREVISION= 1 
7CATEGORIES= lang 6CATEGORIES= lang
8MASTER_SITES= http://luajit.org/download/ 7MASTER_SITES= http://luajit.org/download/
9 8
10MAINTAINER= alnsn@NetBSD.org 9MAINTAINER= alnsn@NetBSD.org
11HOMEPAGE= http://luajit.org/ 10HOMEPAGE= http://luajit.org/
12COMMENT= Just-In-Time Compiler for the Lua programming language 11COMMENT= Just-In-Time Compiler for the Lua programming language
13LICENSE= mit 12LICENSE= mit
14 13
15USE_TOOLS+= gmake 14USE_TOOLS+= gmake
16 15
17NOT_PAX_MPROTECT_SAFE+= bin/luajit 16NOT_PAX_MPROTECT_SAFE+= bin/luajit
18 17
19# Address pkg/47587 lua not linked to pthread causes issues with modules 18# Address pkg/47587 lua not linked to pthread causes issues with modules

cvs diff -r1.8 -r1.9 pkgsrc/lang/LuaJIT2/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/LuaJIT2/distinfo 2016/04/01 13:26:03 1.8
+++ pkgsrc/lang/LuaJIT2/distinfo 2017/05/29 21:47:31 1.9
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.8 2016/04/01 13:26:03 adam Exp $ 1$NetBSD: distinfo,v 1.9 2017/05/29 21:47:31 alnsn Exp $
2 2
3SHA1 (LuaJIT-2.0.4.tar.gz) = 6e533675180300e85d12c4bbeea2d0e41ad21172 3SHA1 (LuaJIT-2.0.5.tar.gz) = 10427215da7d424fd9e48adbea087966053cdb6f
4RMD160 (LuaJIT-2.0.4.tar.gz) = ef9ec596ebf81e3871f060c40303bcd2002474c4 4RMD160 (LuaJIT-2.0.5.tar.gz) = 5176d34fa112c4586394398c3a5c9ce1ad4d4c72
5SHA512 (LuaJIT-2.0.4.tar.gz) = a72957bd85d8f457269e78bf08c19b28c5707df5d19920d61918f8a6913f55913ce13037fb9a6463c04cefde0c6644739f390e09d656e4bbc2c236927aa3f8f9 5SHA512 (LuaJIT-2.0.5.tar.gz) = 2636675602b4a060b0571c05220db2061dd2f38568e35b2be346a0f5e3128d87057d11d3d0d7567d8cc4e0817b5e4cf2c52a17a48065520962b157816465a9fe
6Size (LuaJIT-2.0.4.tar.gz) = 847615 bytes 6Size (LuaJIT-2.0.5.tar.gz) = 849845 bytes
7SHA1 (patch-Makefile) = 4dc6b2fd4f155700aa92e81bf2e10ce2e7990f16 7SHA1 (patch-Makefile) = edea30d017c9d2938d951bfdee88020906945aee
8SHA1 (patch-src_Makefile) = 29426c80f12d34d69eff2dfae1da786827069163 8SHA1 (patch-src_Makefile) = d7236260dc17f470d7d6e41a57a22dcd3a501c28

cvs diff -r1.5 -r1.6 pkgsrc/lang/LuaJIT2/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/lang/LuaJIT2/patches/patch-Makefile 2016/04/01 11:22:36 1.5
+++ pkgsrc/lang/LuaJIT2/patches/patch-Makefile 2017/05/29 21:47:31 1.6
@@ -1,56 +1,32 @@ @@ -1,56 +1,32 @@
1$NetBSD: patch-Makefile,v 1.5 2016/04/01 11:22:36 jperkin Exp $ 1$NetBSD: patch-Makefile,v 1.6 2017/05/29 21:47:31 alnsn Exp $
2 2
3Fix installation. 3Fix installation.
4 4
5--- Makefile.orig 2014-03-12 12:10:00.000000000 +0000 5--- Makefile.orig 2017-05-01 18:11:00.000000000 +0000
6+++ Makefile 6+++ Makefile
7@@ -24,7 +24,6 @@ ABIVER= 5.1 7@@ -24,7 +24,6 @@ ABIVER= 5.1
8 # Change the installation path as needed. This automatically adjusts 8 # Change the installation path as needed. This automatically adjusts
9 # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path! 9 # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
10 # 10 #
11-export PREFIX= /usr/local 11-export PREFIX= /usr/local
12 export MULTILIB= lib 12 export MULTILIB= lib
13 ############################################################################## 13 ##############################################################################
14  14
15@@ -40,7 +39,7 @@ INSTALL_LMODD= $(INSTALL_SHARE)/lua 15@@ -40,7 +39,7 @@ INSTALL_LMODD= $(INSTALL_SHARE)/lua
16 INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) 16 INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
17 INSTALL_CMODD= $(INSTALL_LIB)/lua 17 INSTALL_CMODD= $(INSTALL_LIB)/lua
18 INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER) 18 INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
19-INSTALL_MAN= $(INSTALL_SHARE)/man/man1 19-INSTALL_MAN= $(INSTALL_SHARE)/man/man1
20+INSTALL_MAN= $(DPREFIX)/${PKGMANDIR}/man1 20+INSTALL_MAN= $(DPREFIX)/${PKGMANDIR}/man1
21 INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig 21 INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
22  22
23 INSTALL_TNAME= luajit-$(VERSION) 23 INSTALL_TNAME= luajit-$(VERSION)
24@@ -48,6 +47,7 @@ INSTALL_TSYMNAME= luajit 24@@ -74,7 +73,7 @@ SYMLINK= ln -sf
25 INSTALL_ANAME= libluajit-$(ABIVER).a 
26 INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) 
27 INSTALL_SOSHORT= libluajit-$(ABIVER).so 
28+INSTALL_SOMAJOR= libluajit-$(ABIVER).so.$(MAJVER) 
29 INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib 
30 INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib 
31 INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib 
32@@ -57,6 +57,7 @@ INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL 
33 INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME) 
34 INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT) 
35 INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT) 
36+INSTALL_MAJOR1= $(INSTALL_LIB)/$(INSTALL_SOMAJOR) 
37 INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) 
38 INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) 
39 INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) 
40@@ -73,7 +74,7 @@ SYMLINK= ln -sf 
41 INSTALL_X= install -m 0755 25 INSTALL_X= install -m 0755
42 INSTALL_F= install -m 0644 26 INSTALL_F= install -m 0644
43 UNINSTALL= $(RM) 27 UNINSTALL= $(RM)
44-LDCONFIG= ldconfig -n 28-LDCONFIG= ldconfig -n
45+LDCONFIG= true 29+LDCONFIG= true
46 SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \ 30 SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \
47 -e "s|^multilib=.*|multilib=$(MULTILIB)|" 31 -e "s|^multilib=.*|multilib=$(MULTILIB)|"
48  32
49@@ -113,6 +114,7 @@ install: $(INSTALL_DEP) 
50 cd src && test -f $(FILE_SO) && \ 
51 $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \ 
52 $(LDCONFIG) $(INSTALL_LIB) && \ 
53+ $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_MAJOR1) && \ 
54 $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \ 
55 $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : 
56 cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN) 

cvs diff -r1.1 -r1.2 pkgsrc/lang/LuaJIT2/patches/patch-src_Makefile (expand / switch to unified diff)

--- pkgsrc/lang/LuaJIT2/patches/patch-src_Makefile 2016/04/01 13:26:03 1.1
+++ pkgsrc/lang/LuaJIT2/patches/patch-src_Makefile 2017/05/29 21:47:31 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-src_Makefile,v 1.1 2016/04/01 13:26:03 adam Exp $ 1$NetBSD: patch-src_Makefile,v 1.2 2017/05/29 21:47:31 alnsn Exp $
2 2
3Fix building on OS X. 3Fix building on OS X.
4 4
5--- src/Makefile.orig 2015-05-14 18:30:00.000000000 +0000 5--- src/Makefile.orig 2017-05-01 18:11:00.000000000 +0000
6+++ src/Makefile 6+++ src/Makefile
7@@ -294,9 +294,6 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null 7@@ -297,9 +297,6 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null
8 TARGET_XCFLAGS+= -fno-stack-protector 8 TARGET_XCFLAGS+= -fno-stack-protector
9 endif 9 endif
10 ifeq (Darwin,$(TARGET_SYS)) 10 ifeq (Darwin,$(TARGET_SYS))
11- ifeq (,$(MACOSX_DEPLOYMENT_TARGET)) 11- ifeq (,$(MACOSX_DEPLOYMENT_TARGET))
12- export MACOSX_DEPLOYMENT_TARGET=10.4 12- export MACOSX_DEPLOYMENT_TARGET=10.4
13- endif 13- endif
14 TARGET_STRIP+= -x 14 TARGET_STRIP+= -x
15 TARGET_AR+= 2>/dev/null 
16 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC 15 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
 16 TARGET_DYNXLDOPTS=