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

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

[-- Attachment #1: Type: text/plain, Size: 382 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/38312

ol: update to 2.3.6.
#### Testing the changes
- I tested the changes in this PR: **YES**


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

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

From ce15c723951397d02ca05e4757b312470e81d0f0 Mon Sep 17 00:00:00 2001
From: Yuriy Chumak <yuriy.chumak@mail.com>
Date: Wed, 27 Jul 2022 18:30:25 +0300
Subject: [PATCH] ol: update to 2.3.6.

---
 srcpkgs/ol/files/fmov.patch | 13 +++++++++++++
 srcpkgs/ol/template         | 23 ++++++++++++++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/ol/files/fmov.patch

diff --git a/srcpkgs/ol/files/fmov.patch b/srcpkgs/ol/files/fmov.patch
new file mode 100644
index 000000000000..df05a3a29644
--- /dev/null
+++ b/srcpkgs/ol/files/fmov.patch
@@ -0,0 +1,13 @@
+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 40317b4324c7..5407149cf19f 100644
--- a/srcpkgs/ol/template
+++ b/srcpkgs/ol/template
@@ -1,6 +1,6 @@
 # Template file for 'ol'
 pkgname=ol
-version=2.3.5
+version=2.3.6
 revision=1
 build_style=gnu-makefile
 hostmakedepends="xxd"
@@ -10,9 +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=1f3da2d3b2e47f5c626bfe2727b649db3fd8f53e700dad2a984314275ee7a6ff
+checksum=5a7b8ff5eeba2db63ba8d409c6ebc3af5f9cb21d14a2ec1a279d8137298360ef
 
-CFLAGS="-lm"
+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" \
+
+_apply_patch() {
+	local args="$1" pname="$(basename $2)"
+
+	if [ ! -f ".${pname}_done" ]; then
+		patch -N $args -i $2
+		touch .${pname}_done
+	fi
+}
+
+post_patch() {
+	_apply_patch -p1 ${FILESDIR}/fmov.patch
+}
 
 post_install() {
 	vlicense LICENSE