diff options
Diffstat (limited to 'user/ol')
| -rw-r--r-- | user/ol/APKBUILD | 23 | ||||
| -rw-r--r-- | user/ol/fix-cdefs-test.patch | 21 | ||||
| -rw-r--r-- | user/ol/require-explicit-cdefs.patch | 28 |
3 files changed, 44 insertions, 28 deletions
diff --git a/user/ol/APKBUILD b/user/ol/APKBUILD index 12d08f6d9..ea9eac61e 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/" @@ -11,20 +11,29 @@ 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 + require-explicit-cdefs.patch " +_HAS_32CDEFS=0 +_HAS_64CDEFS=0 +case "$CARCH" in + armel | armhf | armv7) _HAS_32CDEFS=1 ;; + x86 | pmmx) _HAS_32CDEFS=1 ;; + x86_64 | mips64* | aarch64* | ppc64*) _HAS_64CDEFS=1 ;; + mips* | ppc | s390*) _HAS_32CDEFS=1 ;; +esac + build() { - make + make HAS_32CDEFS="${_HAS_32CDEFS}" HAS_64CDEFS="${_HAS_64CDEFS}" } check() { - make check + make HAS_32CDEFS="${_HAS_32CDEFS}" HAS_64CDEFS="${_HAS_64CDEFS}" check } package() { - make DESTDIR="$pkgdir" install + make HAS_32CDEFS="${_HAS_32CDEFS}" HAS_64CDEFS="${_HAS_64CDEFS}" DESTDIR="$pkgdir" install } -sha512sums="c280da70f04637e1c822ab5a4b6eda3a1e1602b4c1fbd59731be2619fb09b0acb079841ba142f9b7b80cbf7539b1c7bd15603311b2ae4a30636f174a1ba2499b ol-2.4.tar.gz -b00c230aaec767b7ef8970813d47222088fd67545a8acebc66208ca7c795392b1db04a6a754ab53a2c0e9f222bf10fc47e082d0965a4253a7053dff1e5cd27f2 fix-cdefs-test.patch" +sha512sums="22e61379d97e52e8f780213780d7f29a93e4846d158629e554f404a1c39e86daef9ce2a1b27d608c40c40850eaff4c2715bdfcb66af6b81cd906f0bcd43bf450 ol-2.6.tar.gz +3b8d5b984b6cb483a51389905648119c3d1de568d13ded6f5606163f8538f9426078357f8494a752af4ee80809fce6fe587f308be9ab010fe19d6eded688ed5a require-explicit-cdefs.patch" 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 diff --git a/user/ol/require-explicit-cdefs.patch b/user/ol/require-explicit-cdefs.patch new file mode 100644 index 000000000..fd4a70ad0 --- /dev/null +++ b/user/ol/require-explicit-cdefs.patch @@ -0,0 +1,28 @@ +diff -ur a/tests/Makefile b/tests/Makefile +--- a/tests/Makefile 2024-11-25 18:28:34.957193217 +0000 ++++ b/tests/Makefile 2024-11-25 18:30:17.261515826 +0000 +@@ -53,20 +53,11 @@ + + # special case, test 64- and 32-bit both + # (maximal testings under main development platform) +-ifeq ($(UNAME)-$(MACHINE),Linux-x86_64) +-HAS_64CDEFS ?= $(call exists,-m64,sys/cdefs.h,exit) +-ifeq ($(HAS_64CDEFS),1) +-DEV_MACHINE ?= 1 ++ifndef HAS_32CDEFS ++$(error HAS_32CDEFS is not set) + endif +-# sudo apt-get install gcc-multilib +-HAS_32CDEFS ?= $(call exists,-m32,sys/cdefs.h,exit) +-ifeq ($(HAS_32CDEFS),1) +-DEV_MACHINE ?= 1 +-endif +-else +-DEV_MACHINE ?= 0 +-HAS_64CDEFS ?= 0 +-HAS_32CDEFS ?= 0 ++ifndef HAS_64CDEFS ++$(error HAS_64CDEFS is not set) + endif + + # ------------- |