summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--user/ol/APKBUILD18
-rw-r--r--user/ol/fix-cdefs-test.patch21
2 files changed, 12 insertions, 27 deletions
diff --git a/user/ol/APKBUILD b/user/ol/APKBUILD
index 12d08f6d9..486c15781 100644
--- a/user/ol/APKBUILD
+++ b/user/ol/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Yuriy Chumak <yuriy.chumak@mail.com>
# Maintainer: Yuriy Chumak <yuriy.chumak@mail.com>
pkgname=ol
-pkgver=2.4
+pkgver=2.6
pkgrel=0
pkgdesc="Purely functional dialect of Lisp"
url="https://yuriy-chumak.github.io/ol/"
@@ -10,9 +10,16 @@ license="LGPL-3.0+ OR MIT"
depends=""
makedepends="vim"
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/yuriy-chumak/$pkgname/archive/$pkgver.tar.gz
- fix-cdefs-test.patch
- "
+source="$pkgname-$pkgver.tar.gz::https://github.com/yuriy-chumak/$pkgname/archive/$pkgver.tar.gz"
+
+HAS32_CDEFS = 0
+HAS64_CDEFS = 0
+case "$CARCH" in
+ armel | armhf | armv7) HAS32_CDEFS = 1 ;;
+ x86 | pmmx) HAS32_CDEFS = 1 ;;
+ x86_64 | mips64* | aarch64* | ppc64*) HAS64_CDEFS = 1 ;;
+ mips* | ppc | s390*) HAS32_CDEFS = 1 ;;
+esac
build() {
make
@@ -26,5 +33,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="c280da70f04637e1c822ab5a4b6eda3a1e1602b4c1fbd59731be2619fb09b0acb079841ba142f9b7b80cbf7539b1c7bd15603311b2ae4a30636f174a1ba2499b ol-2.4.tar.gz
-b00c230aaec767b7ef8970813d47222088fd67545a8acebc66208ca7c795392b1db04a6a754ab53a2c0e9f222bf10fc47e082d0965a4253a7053dff1e5cd27f2 fix-cdefs-test.patch"
+sha512sums="22e61379d97e52e8f780213780d7f29a93e4846d158629e554f404a1c39e86daef9ce2a1b27d608c40c40850eaff4c2715bdfcb66af6b81cd906f0bcd43bf450 ol-2.6.tar.gz"
diff --git a/user/ol/fix-cdefs-test.patch b/user/ol/fix-cdefs-test.patch
deleted file mode 100644
index 41578836c..000000000
--- a/user/ol/fix-cdefs-test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur a/tests/Makefile b/tests/Makefile
---- a/tests/Makefile 2023-03-23 06:59:27.672116150 -0500
-+++ b/tests/Makefile 2023-03-23 06:59:48.224536016 -0500
-@@ -17,8 +17,8 @@
- failed:="\033[1;31mfailed\033[0m"
-
- # 32-/64-bit test environment setup
--HAS_32CDEFS ?= $(call exists,-m32,sys/cdefs.h,exit)
--HAS_64CDEFS ?= $(call exists,-m64,sys/cdefs.h,exit)
-+HAS_32CDEFS ?= 0
-+HAS_64CDEFS ?= 0
-
- ifeq ($(HAS_64CDEFS),1)
- vm64 = printf "64 " && ./vm64 repl <$$F | diff - $$F.ok
-@@ -425,4 +425,4 @@
- @if [ -e $(FAILED) ] ;then rm -f $(FAILED); exit 1 ;fi
- @echo "\033[1;32mpassed!\033[0m"
-
--endif
-\ No newline at end of file
-+endif