From 3ea5830424a1d62e13b40cb8943d7fcc15771fb2 Mon Sep 17 00:00:00 2001 From: sthen Date: Tue, 18 Nov 2025 21:14:53 +0000 Subject: [PATCH] update to luajit-2.1.1763318511 build with -DLUAJIT_ENABLE_CET_BR on aarch64 as well, so we can drop USE_NOBTCFI-aarch64 --- lang/luajit/Makefile | 7 +++---- lang/luajit/distinfo | 4 ++-- lang/luajit/patches/patch-src_Makefile | 2 +- lang/luajit/patches/patch-src_lj_arch_h | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lang/luajit/Makefile b/lang/luajit/Makefile index 04b9966d4de..c364e74e540 100644 --- a/lang/luajit/Makefile +++ b/lang/luajit/Makefile @@ -1,7 +1,6 @@ # keep arch-defines.mk LUAJIT_ARCHS in sync # bump ports which use PROPERTIES:Mluajit if changing ONLY_FOR_ARCHS = aarch64 arm amd64 i386 powerpc -USE_NOBTCFI-aarch64 = Yes # # games/tome4 is using embedded copy of luajit @@ -15,10 +14,10 @@ SHARED_LIBS += luajit-5.1 1.0 # 2.0.5 # changes look (because they often are not)." GH_ACCOUNT = LuaJIT GH_PROJECT = LuaJIT -GH_COMMIT = 25a61a182166fec06f1a1a025eb8fabbb6cf483e +GH_COMMIT = e17ee83326f73d2bbfce5750ae8dc592a3b63c27 # epoch time of the commit; easiest found in ${WRKSRC}/.relver of the # git-archive tar -V = 2.1.1760617492 +V = 2.1.1763318511 COMMENT = just-in-time compiler for Lua DISTNAME = LuaJIT-${V} @@ -48,7 +47,7 @@ MAKE_FLAGS += \ PREFIX="${PREFIX}" \ Q= E=@: -.if ${MACHINE_ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 || ${MACHINE_ARCH} == aarch64 MAKE_FLAGS += \ XCFLAGS=-DLUAJIT_ENABLE_CET_BR .endif diff --git a/lang/luajit/distinfo b/lang/luajit/distinfo index 08d244a0787..6df9b22d7ba 100644 --- a/lang/luajit/distinfo +++ b/lang/luajit/distinfo @@ -1,2 +1,2 @@ -SHA256 (LuaJIT-2.1.1760617492-25a61a18.tar.gz) = P8ortQaNcVDTJKNOqsVVdXuM6U8VVl4KBVI3P3U0CB4= -SIZE (LuaJIT-2.1.1760617492-25a61a18.tar.gz) = 1084654 +SHA256 (LuaJIT-2.1.1763318511-e17ee833.tar.gz) = KOyVVh/jnzpo6VvMn7NGT+6cXyKL3TsT8BG3d2oKd+4= +SIZE (LuaJIT-2.1.1763318511-e17ee833.tar.gz) = 1089090 diff --git a/lang/luajit/patches/patch-src_Makefile b/lang/luajit/patches/patch-src_Makefile index 69a4d34608c..3ebcaaa4f48 100644 --- a/lang/luajit/patches/patch-src_Makefile +++ b/lang/luajit/patches/patch-src_Makefile @@ -12,7 +12,7 @@ Index: src/Makefile endif endif endif -@@ -621,10 +625,10 @@ endif +@@ -625,10 +629,10 @@ endif endif endif diff --git a/lang/luajit/patches/patch-src_lj_arch_h b/lang/luajit/patches/patch-src_lj_arch_h index 9cc7de34f2e..8c35f4f6954 100644 --- a/lang/luajit/patches/patch-src_lj_arch_h +++ b/lang/luajit/patches/patch-src_lj_arch_h @@ -5,7 +5,7 @@ ignore the gcc version check ifdef hell for all base-clang arches. Index: src/lj_arch.h --- src/lj_arch.h.orig +++ src/lj_arch.h -@@ -460,7 +460,7 @@ +@@ -482,7 +482,7 @@ /* -- Checks for requirements --------------------------------------------- */ /* Check for minimum required compiler versions. */