From 99eab1ee83e020211d1cba1123ba49be9d5a37e4 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 | 21 +++++++++++++++++---- 2 files changed, 17 insertions(+), 17 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..38149357ccea 100644 --- a/srcpkgs/ol/template +++ b/srcpkgs/ol/template @@ -1,6 +1,6 @@ # Template file for 'ol' pkgname=ol -version=2.3.6 +version=2.4 revision=1 build_style=gnu-makefile hostmakedepends="xxd" @@ -10,13 +10,26 @@ 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=c0d0beadbd549e453a93dba350ed18b2df070f783c1803cb18ebcc5518ed6e8e case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*) makedepends+=" gcc-multilib";; + i686*) export HAS_64CDEFS=0;; + x86_64*) export HAS_32CDEFS=0;; esac -CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -lm -DOLVM_FFI -DHAS_SOCKETS -DHAS_DLOPEN" +do_build() { + cd ${wrksrc} + # configure, + HAS_SOCKETS=1 HAS_DLOPEN=1 \ + OLVM_FFI=1 OLVM_BUILTIN_FMATH=1 \ + make +} + +do_check() { + HAS_32CDEFS=$HAS_32CDEFS \ + HAS_64CDEFS=$HAS_64CDEFS \ + make check +} post_install() { vlicense LICENSE