aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTuan Hoang <tmhoang@linux.ibm.com>2019-10-14 10:59:22 +0000
committerLeo <thinkabit.ukim@gmail.com>2020-02-29 08:55:23 -0300
commitaf7f776d08cf7c12c3dd62347829fe33e66dceaa (patch)
treeb6229e93c4695ca60722a0805105a3d324a0abc4
parentf282d039df91913c4e2d366d67213675afe1c832 (diff)
downloadaports-af7f776d08cf7c12c3dd62347829fe33e66dceaa.tar.gz
aports-af7f776d08cf7c12c3dd62347829fe33e66dceaa.tar.bz2
aports-af7f776d08cf7c12c3dd62347829fe33e66dceaa.tar.xz
main/luajit: use active fork, enable s390x
Let's start using Siddhesh Poyarekar's tree where development is active and there are more fixes and features. Note that with this commit, we start using snapshots of master branch instead of v2.1 branch. See README for more information. Now upstream is at https://github.com/siddhesh/LuaJIT. Also drop the ppc64le patch since it has been reworked and rebased. Drop luajit binary linking since it's built-in in Makefile.
-rw-r--r--main/luajit/APKBUILD37
1 files changed, 18 insertions, 19 deletions
diff --git a/main/luajit/APKBUILD b/main/luajit/APKBUILD
index a7d14e0ecf..27e50ce7a0 100644
--- a/main/luajit/APKBUILD
+++ b/main/luajit/APKBUILD
@@ -2,21 +2,20 @@
# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
pkgname=luajit
_pkgname=LuaJIT
-pkgver=2.1.0_beta3
-_pkgver=${pkgver/_/-}
-pkgrel=6
-pkgdesc='Just-in-time compiler and replacement for Lua 5.1'
-url='https://luajit.org/'
+pkgver=5.1.20190925
+_pkgver=fedora-${pkgver##*.}
+_compatver=2.1.0-beta3
+pkgrel=0
+pkgdesc="Integration fork of the original LuaJIT"
+url="https://github.com/siddhesh/LuaJIT"
arch="all"
license="MIT"
makedepends="$depends_dev paxmark"
provides="lua"
subpackages="$pkgname-dev $pkgname-doc"
-source="http://luajit.org/download/$_pkgname-$_pkgver.tar.gz
- 0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch
- module-paths.patch
- s390x.patch"
-builddir="$srcdir/$_pkgname-$_pkgver"
+source="https://github.com/siddhesh/$pkgname/archive/$pkgname-$_pkgver.tar.gz
+ module-paths.patch"
+builddir="$srcdir/$_pkgname-$pkgname-$_pkgver"
build() {
cd "$builddir"
@@ -27,8 +26,12 @@ build() {
check() {
cd "$builddir"
- ./src/luajit -v
- ./src/luajit -e 'print("Hello, world!")'
+ # tests fail
+ sed -i -e '/redir.lua/d' test/lib/ffi/index
+ case $CARCH in
+ ppc64le|s390x) sed -i -e '/math_special.lua/d' test/unportable/index;;
+ esac
+ make check
}
package() {
@@ -38,15 +41,11 @@ package() {
local paxflags="-m"
[ "$CARCH" = "x86" ] && paxflags="-msp"
- paxmark $paxflags "$pkgdir"/usr/bin/luajit-$_pkgver
-
- ln -s luajit-$_pkgver "$pkgdir"/usr/bin/luajit
+ paxmark $paxflags "$pkgdir"/usr/bin/luajit-$_compatver
install -Dm644 COPYRIGHT \
"$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
}
-sha512sums="c44e967a0f671ed32b55aee810bc8b3b63737a2d7363b8984ae1949b24f98dbb3f9be7c1e10239fdeb96a3e3c836f606342cbd61838cf9bcadb077443eb5bc12 LuaJIT-2.1.0-beta3.tar.gz
-2e4a4416ad60f6463b2f4ce2c5b8f0519dfb7bfd85e377fed8423477088c5ac9143d0c30a772e65f492317da63bcd06ab01dabe85933c2bd32d6f061167e5515 0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch
-9c6c410e142838c5128c70570e66beb53cc5422df5ecfb8ab0b5f362637b21ab5978c00f19bc1759165df162fd6438a2ed43e25020400011b7bb14014d87c62e module-paths.patch
-56d74d37d703e6b30839c751937d15a3a48d4062cf71f1fc837893b0f05a5befc3734a349168eec490c2d6f66eda028e3738bf57946eb64e8c2407d9c69ada72 s390x.patch"
+sha512sums="d7c256a0865c266e99c8899f10bdb9d8f205dd37a36dcf4bf2cfcd917f2df8fa0e77f8f8dbda06ff371fd1ec834a74128b97ce09de05fe10c88ace8cd9cef515 luajit-fedora-20190925.tar.gz
+9c6c410e142838c5128c70570e66beb53cc5422df5ecfb8ab0b5f362637b21ab5978c00f19bc1759165df162fd6438a2ed43e25020400011b7bb14014d87c62e module-paths.patch"