From 538f276135c5adc77e70225619c5650727ce976d Mon Sep 17 00:00:00 2001 From: Yuriy Chumak Date: Sat, 4 Mar 2023 23:16:11 +0200 Subject: [PATCH] ol: update to 2.4. --- srcpkgs/ol/patches/fmov.patch | 13 ------------- srcpkgs/ol/template | 16 +++++++++------- 2 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 srcpkgs/ol/patches/fmov.patch diff --git a/srcpkgs/ol/patches/fmov.patch b/srcpkgs/ol/patches/fmov.patch deleted file mode 100644 index df05a3a29644..000000000000 --- a/srcpkgs/ol/patches/fmov.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/extensions/ffi.c b/extensions/ffi.c -index 45769490..000a355a 100644 ---- a/extensions/ffi.c -+++ b/extensions/ffi.c -@@ -3275,7 +3277,7 @@ int64_t callback(olvm_t* ol, size_t id, int_t* argi // TODO: change "ol" to "thi - __asm__("BKPT"); - __asm__("mov r0, %[reg]" :: [reg]"r" (OL2F(r))); // todo: I'm not sure - # else -- __asm__("fmov s0, %[reg]" :: [reg]"r" (OL2F(r))); // todo: I'm not sure -+ __asm__("vmov s0, %[reg]" :: [reg]"r" (OL2F(r))); // todo: I'm not sure - # endif - #endif - return 0; // actually we return st(0) diff --git a/srcpkgs/ol/template b/srcpkgs/ol/template index a9c4b0c4a4f0..9a78e836750e 100644 --- a/srcpkgs/ol/template +++ b/srcpkgs/ol/template @@ -1,8 +1,10 @@ # Template file for 'ol' pkgname=ol -version=2.3.6 +version=2.4 revision=1 build_style=gnu-makefile +make_use_env=yes +make_build_args="HAS_SOCKETS=1 HAS_DLOPEN=1 OLVM_FFI=1" hostmakedepends="xxd" short_desc="Purely functional dialect of Lisp" maintainer="rc-05 " @@ -10,13 +12,13 @@ license="LGPL-3.0-or-later, MIT" homepage="https://yuriy-chumak.github.io/ol/" changelog="https://raw.githubusercontent.com/yuriy-chumak/ol/master/doc/CHANGELOG.md" distfiles="https://github.com/yuriy-chumak/ol/archive/${version}.tar.gz" -checksum=5a7b8ff5eeba2db63ba8d409c6ebc3af5f9cb21d14a2ec1a279d8137298360ef +checksum=019978ddcf0befc8b8de9f50899c9dd0f47a3e18cf9556bc72a75ae2d1d965d4 -case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*) makedepends+=" gcc-multilib";; -esac - -CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -lm -DOLVM_FFI -DHAS_SOCKETS -DHAS_DLOPEN" +if [[ "$XBPS_TARGET_WORDSIZE" -eq 32 ]]; then + make_check_args="HAS_64CDEFS=0" +else + make_check_args="HAS_32CDEFS=0" +fi post_install() { vlicense LICENSE