Re: [PR PATCH] [Updated] ol: update to 2.4.

[yuriy-chumak <yuriy-chumak@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1656 bytes --]

There is an updated pull request by yuriy-chumak against master on the void-packages repository

https://github.com/otus-lisp/void-packages ol
https://github.com/void-linux/void-packages/pull/42590

ol: update to 2.4.
# DRAFT
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built and tested this PR locally for my native architecture, **x86_64**
- I built and tested (using **proot** and **qemu**) this PR locally for these architectures (if supported. mark crossbuilds):
  - :heavy_check_mark: x86_64, :heavy_check_mark: x86_64-musl
  - :heavy_check_mark: aarch64, :heavy_check_mark: aarch64-musl
  - :heavy_check_mark: armv5te, :heavy_check_mark: armv5te-musl
  - :heavy_check_mark: armv5tel, :heavy_check_mark: armv5tel-musl
  - :heavy_check_mark: armv6l, :heavy_check_mark: armv6l-musl
  - :heavy_check_mark: armv6hf, :heavy_check_mark: armv6hf-musl
  - :heavy_check_mark: armv7l, :heavy_check_mark: armv7l-musl
  - :heavy_check_mark: armv7hf, :heavy_check_mark: armv7hf-musl
  - :heavy_check_mark: i686, :heavy_check_mark: i686-musl
  - :heavy_check_mark: mips-musl, :heavy_check_mark: mipsel-musl, :heavy_check_mark: mipshf-musl, :heavy_check_mark: mipselhf-musl
  - :heavy_check_mark: ppc64, :heavy_check_mark: ppc64-musl
  - :heavy_check_mark: ppc64le, :heavy_check_mark: ppc64le-musl
  - :heavy_check_mark: ppc, :heavy_check_mark: ppc-musl
  - :heavy_minus_sign: ppcle, :heavy_minus_sign: ppcle-musl


A patch file from https://github.com/void-linux/void-packages/pull/42590.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ol-42590.patch --]
[-- Type: text/x-diff, Size: 2353 bytes --]

From daf2e5cd45c13210ad393ab1534c5f25379dae13 Mon Sep 17 00:00:00 2001
From: Yuriy Chumak <yuriy.chumak@mail.com>
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..2b0984194922 100644
--- a/srcpkgs/ol/template
+++ b/srcpkgs/ol/template
@@ -1,8 +1,9 @@
 # Template file for 'ol'
 pkgname=ol
-version=2.3.6
+version=2.4
 revision=1
 build_style=gnu-makefile
+make_use_env=yes
 hostmakedepends="xxd"
 short_desc="Purely functional dialect of Lisp"
 maintainer="rc-05 <rc23@email.it>"
@@ -10,13 +11,14 @@ 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"
+make_build_args="HAS_SOCKETS=1 HAS_DLOPEN=1 OLVM_FFI=1"
+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