From b8792e1cbfc80fa80a092b3a27a43c49563ecb0f Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sun, 13 Aug 2023 10:40:09 +0200 Subject: [PATCH] luajit: 2.0.5 -> 2.1.0-beta3; adopted port --- luajit/.footprint | 61 ++++++++++++++++++++++++++--------------------- luajit/.signature | 8 +++---- luajit/Pkgfile | 30 ++++++++++++++++------- 3 files changed, 60 insertions(+), 39 deletions(-) diff --git a/luajit/.footprint b/luajit/.footprint index 4e2921ddf..d1c1a1894 100644 --- a/luajit/.footprint +++ b/luajit/.footprint @@ -1,21 +1,20 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -lrwxrwxrwx root/root usr/bin/luajit -> luajit-2.0.5 --rwxr-xr-x root/root usr/bin/luajit-2.0.5 +lrwxrwxrwx root/root usr/bin/luajit -> luajit-2.1.0-beta3 +-rwxr-xr-x root/root usr/bin/luajit-2.1.0-beta3 drwxr-xr-x root/root usr/include/ -lrwxrwxrwx root/root usr/include/luajit -> luajit-2.0 -drwxr-xr-x root/root usr/include/luajit-2.0/ --rw-r--r-- root/root usr/include/luajit-2.0/lauxlib.h --rw-r--r-- root/root usr/include/luajit-2.0/lua.h --rw-r--r-- root/root usr/include/luajit-2.0/lua.hpp --rw-r--r-- root/root usr/include/luajit-2.0/luaconf.h --rw-r--r-- root/root usr/include/luajit-2.0/luajit.h --rw-r--r-- root/root usr/include/luajit-2.0/lualib.h +lrwxrwxrwx root/root usr/include/luajit -> luajit-2.1 +drwxr-xr-x root/root usr/include/luajit-2.1/ +-rw-r--r-- root/root usr/include/luajit-2.1/lauxlib.h +-rw-r--r-- root/root usr/include/luajit-2.1/lua.h +-rw-r--r-- root/root usr/include/luajit-2.1/lua.hpp +-rw-r--r-- root/root usr/include/luajit-2.1/luaconf.h +-rw-r--r-- root/root usr/include/luajit-2.1/luajit.h +-rw-r--r-- root/root usr/include/luajit-2.1/lualib.h drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libluajit-5.1.a -lrwxrwxrwx root/root usr/lib/libluajit-5.1.so -> libluajit-5.1.so.2.0.5 -lrwxrwxrwx root/root usr/lib/libluajit-5.1.so.2 -> libluajit-5.1.so.2.0.5 --rwxr-xr-x root/root usr/lib/libluajit-5.1.so.2.0.5 +lrwxrwxrwx root/root usr/lib/libluajit-5.1.so -> libluajit-5.1.so.2.1.0 +lrwxrwxrwx root/root usr/lib/libluajit-5.1.so.2 -> libluajit-5.1.so.2.1.0 +-rwxr-xr-x root/root usr/lib/libluajit-5.1.so.2.1.0 drwxr-xr-x root/root usr/lib/lua/ drwxr-xr-x root/root usr/lib/lua/5.1/ drwxr-xr-x root/root usr/lib/pkgconfig/ @@ -23,19 +22,27 @@ drwxr-xr-x root/root usr/lib/pkgconfig/ drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/lua/ drwxr-xr-x root/root usr/share/lua/5.1/ -drwxr-xr-x root/root usr/share/luajit-2.0.5/ -drwxr-xr-x root/root usr/share/luajit-2.0.5/jit/ --rw-r--r-- root/root usr/share/luajit-2.0.5/jit/bc.lua --rw-r--r-- root/root usr/share/luajit-2.0.5/jit/bcsave.lua --rw-r--r-- root/root usr/share/luajit-2.0.5/jit/dis_arm.lua --rw-r--r-- root/root usr/share/luajit-2.0.5/jit/dis_mips.lua --rw-r--r-- root/root usr/share/luajit-2.0.5/jit/dis_mipsel.lua --rw-r--r-- root/root usr/share/luajit-2.0.5/jit/dis_ppc.lua --rw-r--r-- root/root usr/share/luajit-2.0.5/jit/dis_x64.lua --rw-r--r-- root/root usr/share/luajit-2.0.5/jit/dis_x86.lua --rw-r--r-- root/root usr/share/luajit-2.0.5/jit/dump.lua --rw-r--r-- root/root usr/share/luajit-2.0.5/jit/v.lua --rw-r--r-- root/root usr/share/luajit-2.0.5/jit/vmdef.lua +drwxr-xr-x root/root usr/share/luajit-2.1.0-beta3/ +drwxr-xr-x root/root usr/share/luajit-2.1.0-beta3/jit/ +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/bc.lua +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/bcsave.lua +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/dis_arm.lua +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/dis_arm64.lua +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/dis_arm64be.lua +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/dis_mips.lua +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/dis_mips64.lua +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/dis_mips64el.lua +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/dis_mips64r6.lua +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/dis_mips64r6el.lua +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/dis_mipsel.lua +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/dis_ppc.lua +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/dis_x64.lua +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/dis_x86.lua +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/dump.lua +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/p.lua +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/v.lua +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/vmdef.lua +-rw-r--r-- root/root usr/share/luajit-2.1.0-beta3/jit/zone.lua drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/luajit.1.gz diff --git a/luajit/.signature b/luajit/.signature index 6248380d3..f6d8e3282 100644 --- a/luajit/.signature +++ b/luajit/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39QufO1WOhm8fhiXN6d7UbM+OVKyo50pdO4fFs6qIL9PcE4X30UIs//+Qz6Dq/kwIvpSqjiNJQN1lp/LK90mMg4= -SHA256 (Pkgfile) = 3717a28cd9df8a8e676869f3fb274d924f066fbd26b4701819b45e43b770b9e3 -SHA256 (.footprint) = c0c2898c7cacffbc31f11aeb9e8a65fe1b37b3e3fb26eed10d0d86a325284473 -SHA256 (LuaJIT-2.0.5.tar.gz) = 874b1f8297c697821f561f9b73b57ffd419ed8f4278c82e05b48806d30c1e979 +RWSagIOpLGJF3xY+FmJAdvsYnV18Ne6mqK7XxUbwoZEr5+9MH6WvpHBDOEEmx5Q9RNVdSq9m+C/UqrhvImTf4LvVeZlBYkMZcgE= +SHA256 (Pkgfile) = ca910734ccb9da039b64c24795a6b9e8e376a296ea945a508005c0e4305540d4 +SHA256 (.footprint) = 8f8c6e0183e86e46a4e5e20291f379f4bf809784980b854f63e3351d7a97322b +SHA256 (luajit-2.1.0-beta3-release.tar.gz) = 940b2afd480d0a6365fcae11415117b016e485f2bf8a68c7a12534b9ab42d35a diff --git a/luajit/Pkgfile b/luajit/Pkgfile index 26040b4b9..cfdfec389 100644 --- a/luajit/Pkgfile +++ b/luajit/Pkgfile @@ -1,17 +1,31 @@ -# Description: Just-in-time compiler and drop-in replacement for Lua 5.1. +# Description: Just-In-Time Compiler for the Lua programming language # URL: https://luajit.org/ -# Maintainer: Danny Rawlins, crux at romster dot me +# Maintainer: Tim Biermann, tbier at posteo dot de name=luajit -version=2.0.5 +# https://github.com/LuaJIT/LuaJIT/issues/665#issuecomment-784452583 +_commit=72efc42ef2258086a9cb797c676e2916b0a9e7e1 +version=2.1.0-beta3 release=1 -source=(https://luajit.org/download/LuaJIT-$version.tar.gz) +source=(https://github.com/LuaJIT/LuaJIT/archive/$_commit/$name-$version-release.tar.gz) build() { - cd LuaJIT-$version + cd LuaJIT-$_commit - make PREFIX=/usr CFLAGS+=' -fPIC' amalg - make PREFIX=/usr DESTDIR=$PKG install + sed -i 's/%{_libexecdir}/%{_libdir}/' etc/luajit.pc - ln -s luajit-2.0 $PKG/usr/include/luajit + make PREFIX="/usr" \ + MULTILIB="/usr/lib" \ + CFLAGS="" \ + LDFLAGS="" \ + DYNAMIC_CC="cc -fPIC -DLUAJIT_ENABLE_LUA52COMPAT" \ + LDCONFIG="true" \ + TARGET_STRIP="true" \ + amalg + make PREFIX=/usr DESTDIR=$PKG install + + ln -s luajit-2.1 $PKG/usr/include/luajit + ln -s luajit-2.1.0-beta3 $PKG/usr/bin/luajit + + find $PKG -type f -name *.a -delete -print }