From: yuriy-chumak <yuriy-chumak@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] ol: update to 2.4.
Date: Sun, 05 Mar 2023 03:22:04 +0100 [thread overview]
Message-ID: <20230305022204.d1KD1moDuEpi-qYpiE6DNLNhMbF6HMGf4FQFqB9AMJI@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42590@inbox.vuxu.org>
[-- 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: 2354 bytes --]
From 99eab1ee83e020211d1cba1123ba49be9d5a37e4 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 | 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
next prev parent reply other threads:[~2023-03-05 2:22 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-04 21:20 [PR PATCH] " yuriy-chumak
2023-03-04 22:26 ` [PR PATCH] [Updated] " yuriy-chumak
2023-03-04 23:45 ` yuriy-chumak
2023-03-05 1:16 ` yuriy-chumak
2023-03-05 1:31 ` yuriy-chumak
2023-03-05 1:36 ` yuriy-chumak
2023-03-05 1:45 ` yuriy-chumak
2023-03-05 2:08 ` yuriy-chumak
2023-03-05 2:22 ` yuriy-chumak [this message]
2023-03-05 19:54 ` [PR REVIEW] " icp1994
2023-03-05 19:54 ` icp1994
2023-03-05 19:54 ` icp1994
2023-03-06 16:32 ` yuriy-chumak
2023-03-06 16:42 ` [PR PATCH] [Updated] " yuriy-chumak
2023-03-06 16:46 ` [PR REVIEW] " yuriy-chumak
2023-03-06 17:10 ` [PR PATCH] [Updated] " yuriy-chumak
2023-03-06 17:42 ` [PR REVIEW] " classabbyamp
2023-03-06 17:50 ` yuriy-chumak
2023-03-06 17:51 ` yuriy-chumak
2023-03-06 17:56 ` yuriy-chumak
2023-03-06 17:58 ` yuriy-chumak
2023-03-06 18:06 ` yuriy-chumak
2023-03-06 18:37 ` classabbyamp
2023-03-06 20:25 ` yuriy-chumak
2023-03-06 20:33 ` [PR PATCH] [Updated] " yuriy-chumak
2023-03-06 20:39 ` [PR REVIEW] " yuriy-chumak
2023-03-06 21:05 ` yuriy-chumak
2023-03-08 15:50 ` [PR PATCH] [Merged]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230305022204.d1KD1moDuEpi-qYpiE6DNLNhMbF6HMGf4FQFqB9AMJI@z \
--to=yuriy-chumak@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).