diff --git a/lang/luajit-devel/Makefile b/lang/luajit-devel/Makefile index 3d1b225cfe5c..b311ee4a2994 100644 --- a/lang/luajit-devel/Makefile +++ b/lang/luajit-devel/Makefile @@ -1,36 +1,37 @@ PORTNAME= luajit -DISTVERSION= 2.1.0.20240821 +DISTVERSION= 2.1.0.20241002 CATEGORIES= lang PKGNAMESUFFIX= -devel DISTNAME= LuaJIT-${DISTVERSION} MAINTAINER= osa@FreeBSD.org COMMENT= Just-In-Time Compiler for Lua WWW= https://luajit.org/luajit.html LICENSE= MIT PD LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYRIGHT IGNORE_riscv64= fails to compile: lj_arch.h:73:2: No support for this architecture (yet) +USES= compiler cpe gmake + CONFLICTS_INSTALL= luajit luajit-openresty -USES= compiler cpe gmake USE_LDCONFIG= yes MAKE_ARGS= CC=${CC} CCOPT= CCOPT_x86= Q= USE_GITHUB= yes -GH_TUPLE= LuaJIT:LuaJIT:c68711c +GH_TUPLE= LuaJIT:LuaJIT:97813fb LUAJIT_VERSION= 2.1 -LUAJIT_SOVERSION= 2.1.1724232689 +LUAJIT_SOVERSION= 2.1.1727870382 PLIST_SUB+= VERSION=${LUAJIT_VERSION} SOVERSION=${LUAJIT_SOVERSION} post-install: ${LN} -sf ${PORTNAME}-${LUAJIT_SOVERSION} \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_MAN} ${WRKSRC}/etc/luajit.1 ${STAGEDIR}${PREFIX}/share/man/man1 .include diff --git a/lang/luajit-devel/distinfo b/lang/luajit-devel/distinfo index 4718aa5fb716..2bfa1582c7d5 100644 --- a/lang/luajit-devel/distinfo +++ b/lang/luajit-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1724338730 -SHA256 (LuaJIT-LuaJIT-2.1.0.20240821-c68711c_GH0.tar.gz) = b9539aa2c18f91d00909b32c36a03c5fa23c75e282d2db1736c366f5d1a4d1cb -SIZE (LuaJIT-LuaJIT-2.1.0.20240821-c68711c_GH0.tar.gz) = 1081813 +TIMESTAMP = 1731095485 +SHA256 (LuaJIT-LuaJIT-2.1.0.20241002-97813fb_GH0.tar.gz) = c96d2b0697c42e7d5da24e273e1d829c77971866be1b49abfa10dacedb661e47 +SIZE (LuaJIT-LuaJIT-2.1.0.20241002-97813fb_GH0.tar.gz) = 1081689 diff --git a/lang/luajit-devel/files/patch-Makefile b/lang/luajit-devel/files/patch-Makefile index e0027fc261c3..fdfc4c47f503 100644 --- a/lang/luajit-devel/files/patch-Makefile +++ b/lang/luajit-devel/files/patch-Makefile @@ -1,59 +1,59 @@ ---- Makefile.orig 2022-08-15 08:16:58.000000000 -0400 -+++ Makefile 2022-08-23 10:24:42.806504000 -0400 -@@ -25,7 +25,7 @@ +--- Makefile.orig 2024-10-02 11:59:42 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! # -export PREFIX= /usr/local +#export PREFIX= /usr/local export MULTILIB= lib ############################################################################## -@@ -35,6 +35,7 @@ +@@ -40,6 +40,7 @@ INSTALL_INC= $(INSTALL_DEFINC) INSTALL_SHARE= $(DPREFIX)/share - INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) + INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION) INSTALL_INC= $(INSTALL_DEFINC) +INSTALL_LIBD= $(DPREFIX)/libdata - INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) + export INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION) INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit -@@ -42,8 +43,7 @@ +@@ -47,8 +48,7 @@ INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER) INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) INSTALL_CMODD= $(INSTALL_LIB)/lua INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER) -INSTALL_MAN= $(INSTALL_SHARE)/man/man1 -INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig +INSTALL_PKGCONFIG= $(INSTALL_LIBD)/pkgconfig INSTALL_TNAME= luajit-$(VERSION) INSTALL_TSYMNAME= luajit -@@ -64,8 +64,8 @@ +@@ -69,8 +69,8 @@ INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) -INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \ - $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD) +INSTALL_DIRS= $(INSTALL_INC) \ + $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \ $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD) -@@ -125,10 +125,8 @@ +@@ -134,10 +134,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) || : ) && \ $(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 -@@ -152,7 +150,6 @@ +@@ -155,7 +153,6 @@ uninstall: for file in $(FILES_INC); do \ $(UNINSTALL) $(INSTALL_INC)/$$file; \ done - $(LDCONFIG) $(INSTALL_LIB) $(RMDIR) $(UNINSTALL_DIRS) || : @echo "==== Successfully uninstalled LuaJIT $(VERSION) from $(PREFIX) ====" diff --git a/lang/luajit-devel/files/patch-src_Makefile b/lang/luajit-devel/files/patch-src_Makefile index 88511431f17a..ef9c346256f2 100644 --- a/lang/luajit-devel/files/patch-src_Makefile +++ b/lang/luajit-devel/files/patch-src_Makefile @@ -1,29 +1,29 @@ ---- src/Makefile.orig 2019-06-26 21:12:49 UTC +--- src/Makefile.orig 2024-10-02 11:59:42 UTC +++ src/Makefile -@@ -24,7 +24,7 @@ NODOTABIVER= 51 +@@ -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) -@@ -36,7 +36,7 @@ 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. -@@ -47,7 +47,7 @@ CCOPT= -O2 -fomit-frame-pointer +@@ -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-devel/files/patch-src_lj__prng.c b/lang/luajit-devel/files/patch-src_lj__prng.c index f22f32475546..0a83880e65d7 100644 --- a/lang/luajit-devel/files/patch-src_lj__prng.c +++ b/lang/luajit-devel/files/patch-src_lj__prng.c @@ -1,18 +1,18 @@ ---- src/lj_prng.c.orig 2021-10-27 20:58:55.107726000 -0400 -+++ src/lj_prng.c 2021-10-27 21:00:37.533971000 -0400 -@@ -109,6 +109,7 @@ +--- 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 #else +#ifndef LJ_TARGET_HAS_GETENTROPY #if LJ_TARGET_OSX && !LJ_TARGET_IOS /* ** In their infinite wisdom Apple decided to disallow getentropy() in the -@@ -120,6 +121,7 @@ +@@ -124,6 +125,7 @@ static PRGR libfunc_rgr; #include #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 #define LJ_TARGET_HAS_GETENTROPY 1 +#endif #endif - #endif - #elif (LJ_TARGET_BSD && !defined(__NetBSD__)) || LJ_TARGET_SOLARIS || LJ_TARGET_CYGWIN + #elif (LJ_TARGET_BSD && !defined(__NetBSD__)) || LJ_TARGET_SOLARIS || LJ_TARGET_CYGWIN || LJ_TARGET_QNX + #define LJ_TARGET_HAS_GETENTROPY 1