summaryrefslogtreecommitdiff
path: root/lang/luajit
diff options
context:
space:
mode:
Diffstat (limited to 'lang/luajit')
-rw-r--r--lang/luajit/Makefile39
-rw-r--r--lang/luajit/distinfo8
-rw-r--r--lang/luajit/files/patch-Makefile32
-rw-r--r--lang/luajit/files/patch-etc_luajit.pc6
-rw-r--r--lang/luajit/files/patch-src_Makefile29
-rw-r--r--lang/luajit/files/patch-src_jit_bcsave.lua11
-rw-r--r--lang/luajit/files/patch-src_lj__ccallback.c10
-rw-r--r--lang/luajit/files/patch-src_lj__prng.c18
-rw-r--r--lang/luajit/pkg-plist46
9 files changed, 121 insertions, 78 deletions
diff --git a/lang/luajit/Makefile b/lang/luajit/Makefile
index 85e695a309e1..eb917faf3628 100644
--- a/lang/luajit/Makefile
+++ b/lang/luajit/Makefile
@@ -1,46 +1,37 @@
PORTNAME= luajit
-DISTVERSION= 2.0.5
-PORTREVISION= 7
+DISTVERSION= 2.1.0.20250528
+PORTREVISION= 1
CATEGORIES= lang
-MASTER_SITES= https://luajit.org/download/
DISTNAME= LuaJIT-${DISTVERSION}
-PATCH_SITES= https://github.com/LuaJIT/LuaJIT/commit/
-PATCHFILES= a4f4f5b83564a1075bea0ac7c1fd8768be1caff7.patch:-p1
-
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= osa@FreeBSD.org
COMMENT= Just-In-Time Compiler for Lua
WWW= https://luajit.org/luajit.html
-OPTIONS_DEFINE= PTHREAD
-PTHREAD_DESC= with pthread support
-
LICENSE= MIT PD
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-IGNORE_aarch64= fails to compile: lj_arch.h:55:2: No support for this architecture (yet)
-IGNORE_powerpc64= fails to compile: lj_arch.h:346:2: No support for PowerPC 64 bit mode
-IGNORE_riscv64= fails to compile: lj_arch.h:55:2: No support for this architecture (yet)
-
-CONFLICTS_INSTALL= luajit-devel luajit-openresty
+IGNORE_riscv64= fails to compile: lj_arch.h:73:2: No support for this architecture (yet)
-WRKSRC= ${WRKDIR}/LuaJIT-${DISTVERSION}
USES= compiler cpe gmake
+
+CONFLICTS_INSTALL= luajit-openresty
+
USE_LDCONFIG= yes
-MAKE_ARGS= CC=${CC} CCOPT= CCOPT_x86=
+MAKE_ARGS= CC=${CC} CCOPT= CCOPT_x86= Q=
-PLIST_SUB+= VERSION=${DISTVERSION}
+USE_GITHUB= yes
+GH_TUPLE= LuaJIT:LuaJIT:f9140a6
-.include <bsd.port.pre.mk>
+LUAJIT_VERSION= 2.1
+LUAJIT_SOVERSION= 2.1.1748459687
-.if ${PORT_OPTIONS:MPTHREAD}
-LDFLAGS+= -lm -pthread
-.endif
+PLIST_SUB+= VERSION=${LUAJIT_VERSION} SOVERSION=${LUAJIT_SOVERSION}
post-install:
- ${LN} -sf ${PORTNAME}-${DISTVERSION} \
+ ${LN} -sf ${PORTNAME}-${LUAJIT_SOVERSION} \
${STAGEDIR}${PREFIX}/bin/${PORTNAME}
${INSTALL_MAN} ${WRKSRC}/etc/luajit.1 ${STAGEDIR}${PREFIX}/share/man/man1
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/luajit/distinfo b/lang/luajit/distinfo
index 6678f4a7dbd5..a7daefeea90e 100644
--- a/lang/luajit/distinfo
+++ b/lang/luajit/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1672840245
-SHA256 (LuaJIT-2.0.5.tar.gz) = 874b1f8297c697821f561f9b73b57ffd419ed8f4278c82e05b48806d30c1e979
-SIZE (LuaJIT-2.0.5.tar.gz) = 849845
-SHA256 (a4f4f5b83564a1075bea0ac7c1fd8768be1caff7.patch) = 172ee031fa64644b91c74b8488f976b39215bd128e5217eb93791729bd20916a
-SIZE (a4f4f5b83564a1075bea0ac7c1fd8768be1caff7.patch) = 831
+TIMESTAMP = 1748983264
+SHA256 (LuaJIT-LuaJIT-2.1.0.20250528-f9140a6_GH0.tar.gz) = dd32256c3c8c02c2e7195c042b9eea774141dbe887dae951e55d10713ac92ccf
+SIZE (LuaJIT-LuaJIT-2.1.0.20250528-f9140a6_GH0.tar.gz) = 1083034
diff --git a/lang/luajit/files/patch-Makefile b/lang/luajit/files/patch-Makefile
index eebac4678922..6ec5a3b862bd 100644
--- a/lang/luajit/files/patch-Makefile
+++ b/lang/luajit/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2017-05-01 14:11:00.000000000 -0400
-+++ Makefile 2017-05-03 11:14:26.850889000 -0400
-@@ -24,7 +24,7 @@
+--- Makefile.orig 2025-05-28 19:14:47 UTC
++++ Makefile
+@@ -30,7 +30,7 @@ VERSION= $(MMVERSION).$(RELVER)
# Change the installation path as needed. This automatically adjusts
# the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
#
@@ -9,15 +9,15 @@
export MULTILIB= lib
##############################################################################
-@@ -33,6 +33,7 @@
- INSTALL_LIB= $(DPREFIX)/$(MULTILIB)
- INSTALL_SHARE= $(DPREFIX)/share
- INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
+@@ -41,6 +41,7 @@ INSTALL_INC= $(INSTALL_DEFINC)
+ INSTALL_SHARE= $(DESTDIR)$(INSTALL_SHARE_)
+ INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION)
+ INSTALL_INC= $(INSTALL_DEFINC)
+INSTALL_LIBD= $(DPREFIX)/libdata
- INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION)
- INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
-@@ -40,8 +41,7 @@
+ export INSTALL_LJLIBD= $(INSTALL_SHARE_)/luajit-$(MMVERSION)
+ INSTALL_JITLIB= $(DESTDIR)$(INSTALL_LJLIBD)/jit
+@@ -48,8 +49,7 @@ INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
INSTALL_CMODD= $(INSTALL_LIB)/lua
INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
@@ -27,7 +27,7 @@
INSTALL_TNAME= luajit-$(VERSION)
INSTALL_TSYMNAME= luajit
-@@ -62,8 +62,8 @@
+@@ -70,8 +70,8 @@ INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME)
INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
@@ -35,21 +35,21 @@
- $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD)
+INSTALL_DIRS= $(INSTALL_INC) \
+ $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB)
- UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \
+ UNINSTALL_DIRS= $(INSTALL_JITLIB) $(DESTDIR)$(INSTALL_LJLIBD) $(INSTALL_INC) \
$(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD)
-@@ -118,10 +118,8 @@
- $(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
+@@ -135,10 +135,8 @@ install: $(INSTALL_DEP)
+ $(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
cd src && test -f $(FILE_SO) && \
$(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
-- $(LDCONFIG) $(INSTALL_LIB) && \
+- ( $(LDCONFIG) $(INSTALL_LIB) || : ) && \
$(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
$(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
- cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
$(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
$(RM) $(FILE_PC).tmp
-@@ -139,7 +137,6 @@
+@@ -156,7 +154,6 @@ uninstall:
for file in $(FILES_INC); do \
$(UNINSTALL) $(INSTALL_INC)/$$file; \
done
diff --git a/lang/luajit/files/patch-etc_luajit.pc b/lang/luajit/files/patch-etc_luajit.pc
index 9470bf42dd7e..8867dc0b4be8 100644
--- a/lang/luajit/files/patch-etc_luajit.pc
+++ b/lang/luajit/files/patch-etc_luajit.pc
@@ -1,6 +1,6 @@
---- etc/luajit.pc.orig 2017-05-03 11:00:21.130353000 -0400
-+++ etc/luajit.pc 2017-05-03 11:00:54.763566000 -0400
-@@ -21,5 +21,5 @@
+--- etc/luajit.pc.orig 2019-06-26 21:12:49 UTC
++++ etc/luajit.pc
+@@ -21,5 +21,5 @@ URL: http://luajit.org
Version: ${version}
Requires:
Libs: -L${libdir} -l${libname}
diff --git a/lang/luajit/files/patch-src_Makefile b/lang/luajit/files/patch-src_Makefile
new file mode 100644
index 000000000000..ef9c346256f2
--- /dev/null
+++ b/lang/luajit/files/patch-src_Makefile
@@ -0,0 +1,29 @@
+--- src/Makefile.orig 2024-10-02 11:59:42 UTC
++++ src/Makefile
+@@ -23,7 +23,7 @@ NODOTABIVER= 51
+ # removing the '#' in front of them. Make sure you force a full recompile
+ # with "make clean", followed by "make" if you change any options.
+ #
+-DEFAULT_CC = gcc
++DEFAULT_CC = cc
+ #
+ # LuaJIT builds as a native 32 or 64 bit binary by default.
+ CC= $(DEFAULT_CC)
+@@ -35,7 +35,7 @@ CC= $(DEFAULT_CC)
+ # to slow down the C part by not omitting it. Debugging, tracebacks and
+ # unwinding are not affected -- the assembler part has frame unwind
+ # information and GCC emits it where needed (x64) or with -g (see CCDEBUG).
+-CCOPT= -O2 -fomit-frame-pointer
++#CCOPT= -O2 -fomit-frame-pointer
+ # Use this if you want to generate a smaller binary (but it's slower):
+ #CCOPT= -Os -fomit-frame-pointer
+ # Note: it's no longer recommended to use -O3 with GCC 4.x.
+@@ -46,7 +46,7 @@ CCOPT= -O2 -fomit-frame-pointer
+ # x86/x64 only: For GCC 4.2 or higher and if you don't intend to distribute
+ # the binaries to a different machine you could also use: -march=native
+ #
+-CCOPT_x86= -march=i686 -msse -msse2 -mfpmath=sse
++#CCOPT_x86= -march=i686 -msse -msse2 -mfpmath=sse
+ CCOPT_x64=
+ CCOPT_arm=
+ CCOPT_arm64=
diff --git a/lang/luajit/files/patch-src_jit_bcsave.lua b/lang/luajit/files/patch-src_jit_bcsave.lua
deleted file mode 100644
index af087ea121a1..000000000000
--- a/lang/luajit/files/patch-src_jit_bcsave.lua
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/jit/bcsave.lua.orig 2017-05-01 18:11:00 UTC
-+++ src/jit/bcsave.lua
-@@ -275,7 +275,7 @@ typedef struct {
- o.sect[2].size = fofs(ofs)
- o.sect[3].type = f32(3) -- .strtab
- o.sect[3].ofs = fofs(sofs + ofs)
-- o.sect[3].size = fofs(#symname+1)
-+ o.sect[3].size = fofs(#symname+2)
- ffi.copy(o.space+ofs+1, symname)
- ofs = ofs + #symname + 2
- o.sect[4].type = f32(1) -- .rodata
diff --git a/lang/luajit/files/patch-src_lj__ccallback.c b/lang/luajit/files/patch-src_lj__ccallback.c
new file mode 100644
index 000000000000..40d0cc76b15b
--- /dev/null
+++ b/lang/luajit/files/patch-src_lj__ccallback.c
@@ -0,0 +1,10 @@
+--- src/lj_ccallback.c.orig 2020-10-28 11:55:44 UTC
++++ src/lj_ccallback.c
+@@ -20,6 +20,7 @@
+ #include "lj_mcode.h"
+ #include "lj_trace.h"
+ #include "lj_vm.h"
++#include "lualib.h"
+
+ /* -- Target-specific handling of callback slots -------------------------- */
+
diff --git a/lang/luajit/files/patch-src_lj__prng.c b/lang/luajit/files/patch-src_lj__prng.c
new file mode 100644
index 000000000000..0a83880e65d7
--- /dev/null
+++ b/lang/luajit/files/patch-src_lj__prng.c
@@ -0,0 +1,18 @@
+--- src/lj_prng.c.orig 2024-10-02 11:59:42 UTC
++++ src/lj_prng.c
+@@ -113,6 +113,7 @@ static PRGR libfunc_rgr;
+ #include <sys/syscall.h>
+ #else
+
++#ifndef LJ_TARGET_HAS_GETENTROPY
+ #if LJ_TARGET_OSX && !LJ_TARGET_IOS
+ /*
+ ** In their infinite wisdom Apple decided to disallow getentropy() in the
+@@ -124,6 +125,7 @@ static PRGR libfunc_rgr;
+ #include <Availability.h>
+ #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+ #define LJ_TARGET_HAS_GETENTROPY 1
++#endif
+ #endif
+ #elif (LJ_TARGET_BSD && !defined(__NetBSD__)) || LJ_TARGET_SOLARIS || LJ_TARGET_CYGWIN || LJ_TARGET_QNX
+ #define LJ_TARGET_HAS_GETENTROPY 1
diff --git a/lang/luajit/pkg-plist b/lang/luajit/pkg-plist
index 17f6e4424958..7d9ff63be460 100644
--- a/lang/luajit/pkg-plist
+++ b/lang/luajit/pkg-plist
@@ -1,25 +1,33 @@
bin/luajit
-bin/luajit-%%VERSION%%
-include/luajit-2.0/lauxlib.h
-include/luajit-2.0/lua.h
-include/luajit-2.0/lua.hpp
-include/luajit-2.0/luaconf.h
-include/luajit-2.0/luajit.h
-include/luajit-2.0/lualib.h
+bin/luajit-%%SOVERSION%%
+include/luajit-%%VERSION%%/lauxlib.h
+include/luajit-%%VERSION%%/lua.h
+include/luajit-%%VERSION%%/lua.hpp
+include/luajit-%%VERSION%%/luaconf.h
+include/luajit-%%VERSION%%/luajit.h
+include/luajit-%%VERSION%%/lualib.h
lib/libluajit-5.1.a
lib/libluajit-5.1.so
lib/libluajit-5.1.so.2
-lib/libluajit-5.1.so.%%VERSION%%
+lib/libluajit-5.1.so.%%SOVERSION%%
libdata/pkgconfig/luajit.pc
-share/luajit-%%VERSION%%/jit/bc.lua
-share/luajit-%%VERSION%%/jit/bcsave.lua
-share/luajit-%%VERSION%%/jit/dis_arm.lua
-share/luajit-%%VERSION%%/jit/dis_mips.lua
-share/luajit-%%VERSION%%/jit/dis_mipsel.lua
-share/luajit-%%VERSION%%/jit/dis_ppc.lua
-share/luajit-%%VERSION%%/jit/dis_x64.lua
-share/luajit-%%VERSION%%/jit/dis_x86.lua
-share/luajit-%%VERSION%%/jit/dump.lua
-share/luajit-%%VERSION%%/jit/v.lua
-share/luajit-%%VERSION%%/jit/vmdef.lua
share/man/man1/luajit.1.gz
+%%DATADIR%%-%%VERSION%%/jit/bc.lua
+%%DATADIR%%-%%VERSION%%/jit/bcsave.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_arm.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_arm64.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_arm64be.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_mips.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_mips64.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_mips64el.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_mips64r6.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_mips64r6el.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_mipsel.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_ppc.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_x64.lua
+%%DATADIR%%-%%VERSION%%/jit/dis_x86.lua
+%%DATADIR%%-%%VERSION%%/jit/dump.lua
+%%DATADIR%%-%%VERSION%%/jit/p.lua
+%%DATADIR%%-%%VERSION%%/jit/v.lua
+%%DATADIR%%-%%VERSION%%/jit/vmdef.lua
+%%DATADIR%%-%%VERSION%%/jit/zone.lua
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 21:17:43 +0000