Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/luajit/PKGBUILD75
-rw-r--r--extra/luajit/c7815e1a1b49871e645252bb12e722fb4879df11.patch13
2 files changed, 13 insertions, 75 deletions
diff --git a/extra/luajit/PKGBUILD b/extra/luajit/PKGBUILD
index a0d9c9af..3f91f700 100644
--- a/extra/luajit/PKGBUILD
+++ b/extra/luajit/PKGBUILD
@@ -1,69 +1,20 @@
-# Maintainer: Daurnimator <daurnimator@archlinux.org>
-# Maintainer: Lukas Fleischer <lfleischer@archlinux.org>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-# Contributor: Chris Brannon <chris@the-brannons.com>
-# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-# Contributor: Anders Bergh <anders1@gmail.com>
-
-pkgname=luajit
-# LuaJIT has abandoned versioned releases and now advises using git HEAD
-# https://github.com/LuaJIT/LuaJIT/issues/665#issuecomment-784452583
-_commit=505e2c03de35e2718eef0d2d3660712e06dadf1f
-pkgver="2.1.0.beta3.r471.g${_commit::8}"
-pkgrel=1
-pkgdesc='Just-in-time compiler and drop-in replacement for Lua 5.1'
-arch=(i486 i686 pentium4 'x86_64')
-url='https://luajit.org/'
-license=('MIT')
-depends=('gcc-libs')
-source=("LuaJIT-${_commit}.tar.gz::https://repo.or.cz/luajit-2.0.git/snapshot/${_commit}.tar.gz")
-md5sums=('0847dc535736846a9a1436e18d8c509d')
-sha256sums=('b89d081aac4189a06b736c667f47cc60e0cc4591933b7ed50db38cf58496386e')
-b2sums=('89bed923ff34d2de813dee17f130496ffeaa6bc5caf9252be1df7d35e87fa7398930f1fe35f95650694d344bc99d5b2c0c4abc4568f1dac318822a832d44c3a4')
-
-build() {
- cd "luajit-2.0-${_commit::7}"
- # Avoid early stripping
- make amalg PREFIX=/usr BUILDMODE=dynamic TARGET_STRIP=" @:"
-}
-
-package() {
- cd "luajit-2.0-${_commit::7}"
-
- make install DESTDIR="$pkgdir" PREFIX=/usr
- install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
-
- ln -sf luajit-2.1.0-beta3 "$pkgdir/usr/bin/luajit"
-}
-# Re-enable x87 support for i686 CPUs (fix from KitsuWhooa)
if [ "$CARCH" = 'i486' ]; then
source+=('luajit-2.0-505e2c0-i486.patch')
- md5sums+=('44317c2d006d45b0970cee8b55a4c05e')
- sha256sums+=('6a758da52d9ddd0162ba342276c4aa4454662b2fe8b89c8a7aa987677679fd30')
b2sums+=('4a467db526fa550942dee7da7dd599f5976f519573773afab74c372bbb2aa243d60384699c50695dadf0be086fc5b54253692d0836c22da4b079a73b0eb7a822')
- eval "$(
- {
- declare -f prepare \
- || printf 'prepare ()\n{\ncd "luajit-2.0-${_commit::7}"\n}\n'
- } \
- | sed '
- $ i patch -p1 -i "$srcdir/luajit-2.0-505e2c0-i486.patch"
- '
- )"
-
+ prepare() {
+ cd "LuaJIT-${_commit}"
+ patch -p1 -i "$srcdir/luajit-2.0-505e2c0-i486.patch"
+ }
fi
+
if [ "$CARCH" = 'i686' ]; then
source+=('c7815e1a1b49871e645252bb12e722fb4879df11.patch')
- md5sums+=('25a3483026a359e06ec828bc666dc853')
- sha256sums+=('a711e1d7ad7a16d0e6ba044fedc284cc0c4bee710c2d910fd9f0f0af8765c1a7')
- b2sums+=('2d79b2dad25ba3a771348cfd38883334f511de703d2ccfdd00b808867ecf53201d680388c730aaf8941cb5159f6b819020c2da04b75346bc42428973c7f27420')
- eval "$(
- {
- declare -f prepare \
- || printf 'prepare ()\n{\ncd "luajit-2.0-${_commit::7}"\n}\n'
- } \
- | sed '
- $ i patch -p1 -i "$srcdir/c7815e1a1b49871e645252bb12e722fb4879df11.patch"
- '
- )"
+ b2sums+=('fabd0be78309d8211e96d4d0cf105ae6a27f46110d8b19513d10bdd7c6045221fc5c8e21d1bcc1def854d7d1bf6473c99fb7bc7e4d5307188129c3c87cf8c69b')
+ prepare() {
+ cd "LuaJIT-${_commit}"
+ patch -p1 -i "$srcdir/c7815e1a1b49871e645252bb12e722fb4879df11.patch"
+ }
fi
+
+unset md5sums
+unset sha256sums
diff --git a/extra/luajit/c7815e1a1b49871e645252bb12e722fb4879df11.patch b/extra/luajit/c7815e1a1b49871e645252bb12e722fb4879df11.patch
index 13048730..f9082b45 100644
--- a/extra/luajit/c7815e1a1b49871e645252bb12e722fb4879df11.patch
+++ b/extra/luajit/c7815e1a1b49871e645252bb12e722fb4879df11.patch
@@ -11,7 +11,6 @@ JIT is disabled by default and untested
src/lj_asm.c | 16 +
src/lj_jit.h | 18 +-
src/lj_vm.h | 3 +-
- src/msvcbuild.bat | 1 -
src/vm_x86.dasc | 798 +++++++++++++++++++++++++++++++++++++++++-----
7 files changed, 793 insertions(+), 100 deletions(-)
@@ -217,18 +216,6 @@ index c66db0049f..9bc6d62fab 100644
#define lj_vm_floor floor
#define lj_vm_ceil ceil
#else
-diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
-index d323d8d44d..67e53574de 100644
---- a/src/msvcbuild.bat
-+++ b/src/msvcbuild.bat
-@@ -41,7 +41,6 @@ if exist minilua.exe.manifest^
- @set DASC=vm_x86.dasc
- @set DASMFLAGS=-D WIN -D JIT -D FFI
- @set LJARCH=x86
--@set LJCOMPILE=%LJCOMPILE% /arch:SSE2
- :X64
- @if "%1" neq "nogc64" goto :GC64
- @shift
diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc
index 18ca87b545..3efbba6cdd 100644
--- a/src/vm_x86.dasc