* [PR PATCH] [WIP] m4ri: update to 20250128.
@ 2025-02-03 11:44 Eloitor
2025-02-03 13:29 ` tornaria
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Eloitor @ 2025-02-03 11:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 822 bytes --]
There is a new pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages m4rie
https://github.com/void-linux/void-packages/pull/54197
[WIP] m4ri: update to 20250128.
#### Testing the changes
- I tested the changes in this PR: **NO**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
When I tried to install the package I got:
```
brial-1.2.12_1: broken, unresolvable shlib `libm4ri-0.0.20200125.so'
m4rie-20200125_2: broken, unresolvable shlib `libm4ri-0.0.20200125.so'
sagemath-10.5_1: broken, unresolvable shlib `libm4ri-0.0.20200125.so'
Transaction aborted due to unresolved shlibs.
```
How should I proceed?
A patch file from https://github.com/void-linux/void-packages/pull/54197.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-m4rie-54197.patch --]
[-- Type: text/x-diff, Size: 3107 bytes --]
From af37aab9bce658943dae4537bb7b2ffed68dcf9f Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Mon, 3 Feb 2025 12:41:36 +0100
Subject: [PATCH] m4ri: update to 20250128.
---
common/shlibs | 2 +-
srcpkgs/m4ri/patches/m4ri-simd_cflags_in_tests.patch | 11 -----------
srcpkgs/m4ri/template | 12 ++++++------
3 files changed, 7 insertions(+), 18 deletions(-)
delete mode 100644 srcpkgs/m4ri/patches/m4ri-simd_cflags_in_tests.patch
diff --git a/common/shlibs b/common/shlibs
index 175786786b4936..79ae3af77de39e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4251,7 +4251,7 @@ libpolys-4.4.0.so singular-4.4.0_1
libsingular_resources-4.4.0.so singular-4.4.0_1
libbrial.so.3 brial-1.2.10_1
libbrial_groebner.so.3 brial-1.2.10_1
-libm4ri-0.0.20200125.so m4ri-20200125_1
+libm4ri-0.0.20250128.so m4ri-20250128_1
libm4rie-0.0.20200125.so m4rie-20200125_1
libptytty.so.0 libptytty-2.0_1
libcoeurl.so.0.3 coeurl-0.3.0_1
diff --git a/srcpkgs/m4ri/patches/m4ri-simd_cflags_in_tests.patch b/srcpkgs/m4ri/patches/m4ri-simd_cflags_in_tests.patch
deleted file mode 100644
index ffa64b120fc28f..00000000000000
--- a/srcpkgs/m4ri/patches/m4ri-simd_cflags_in_tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tests/Makefile.in 2020-01-25 01:34:59.000000000 -0300
-+++ b/tests/Makefile.in 2021-11-10 08:13:46.505793446 -0300
-@@ -609,7 +609,7 @@
- TOPBUILDDIR = $(builddir)/..
- DEFINES =
- # include TOPBUILDIR for m4ri_config.h
--AM_CFLAGS = -I$(TOPSRCDIR) -I$(TOPBUILDDIR) -D_XOPEN_SOURCE=600 $(DEFINES) @OPENMP_CFLAGS@ @PAPI_CFLAGS@
-+AM_CFLAGS = -I$(TOPSRCDIR) -I$(TOPBUILDDIR) -D_XOPEN_SOURCE=600 $(DEFINES) $(SIMD_CFLAGS) $(OPENMP_CFLAGS) $(PAPI_CFLAGS)
- STAGEDIR := $(realpath -s $(TOPBUILDDIR)/.libs)
- AM_LDFLAGS = -L$(STAGEDIR) -Wl,-rpath,$(STAGEDIR) -lm4ri $(LIBM) @PAPI_LDFLAGS@ @PAPI_LIBS@ -no-install
- test_smallops_SOURCES = test_smallops.c testing.c testing.h
diff --git a/srcpkgs/m4ri/template b/srcpkgs/m4ri/template
index 56e60ed16f5998..d0e2d4d4ffbf19 100644
--- a/srcpkgs/m4ri/template
+++ b/srcpkgs/m4ri/template
@@ -1,17 +1,17 @@
# Template file for 'm4ri'
pkgname=m4ri
-version=20200125
-revision=2
+version=20250128
+revision=1
build_style=gnu-configure
configure_args="--enable-openmp ax_cv_have_sse3_ext=no ax_cv_have_ssse3_ext=no"
hostmakedepends="pkg-config"
makedepends="libgomp-devel libpng-devel"
short_desc="Library for fast arithmetic with dense matrices over GF(2)"
-maintainer="Eloi Torrents <eloitorrentsj@gmail.com>"
+maintainer="Eloi Torrents <eloitor@duck.com>"
license="GPL-2.0-or-later"
-homepage="https://bitbucket.org/malb/m4ri"
-distfiles="https://bitbucket.org/malb/m4ri/downloads/${pkgname}-${version}.tar.gz"
-checksum=0dfb34aed351882a0f2281535ea6f81c690a5efeb14edab131d9ba0dffe44863
+homepage="https://github.com/malb/m4ri"
+distfiles="https://github.com/malb/m4ri/releases/download/${version}/m4ri-${version}.tar.gz"
+checksum=b4098db651483c0e1506c16f79091eba02f41dadbacf1bb25be8eb97e5515f96
m4ri-devel_package() {
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [WIP] m4ri: update to 20250128.
2025-02-03 11:44 [PR PATCH] [WIP] m4ri: update to 20250128 Eloitor
@ 2025-02-03 13:29 ` tornaria
2025-02-03 13:53 ` [PR PATCH] [Closed]: " Eloitor
2025-02-03 13:53 ` Eloitor
2 siblings, 0 replies; 4+ messages in thread
From: tornaria @ 2025-02-03 13:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 416 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/54197#issuecomment-2631011488
Comment:
See #54198.
What the message says: when the soname for `m4ri` changes, you have to rebuild `m4rie`, `brial`, and `sagemath`. Also, the sonames were changed to `libm4ri.so.1` and `libm4rie.so.1`, hopefully this means we don't have to rebuild `sagemath` in future updates.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Closed]: [WIP] m4ri: update to 20250128.
2025-02-03 11:44 [PR PATCH] [WIP] m4ri: update to 20250128 Eloitor
2025-02-03 13:29 ` tornaria
@ 2025-02-03 13:53 ` Eloitor
2025-02-03 13:53 ` Eloitor
2 siblings, 0 replies; 4+ messages in thread
From: Eloitor @ 2025-02-03 13:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 673 bytes --]
There's a closed pull request on the void-packages repository
[WIP] m4ri: update to 20250128.
https://github.com/void-linux/void-packages/pull/54197
Description:
#### Testing the changes
- I tested the changes in this PR: **NO**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
When I tried to install the package I got:
```
brial-1.2.12_1: broken, unresolvable shlib `libm4ri-0.0.20200125.so'
m4rie-20200125_2: broken, unresolvable shlib `libm4ri-0.0.20200125.so'
sagemath-10.5_1: broken, unresolvable shlib `libm4ri-0.0.20200125.so'
Transaction aborted due to unresolved shlibs.
```
How should I proceed?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [WIP] m4ri: update to 20250128.
2025-02-03 11:44 [PR PATCH] [WIP] m4ri: update to 20250128 Eloitor
2025-02-03 13:29 ` tornaria
2025-02-03 13:53 ` [PR PATCH] [Closed]: " Eloitor
@ 2025-02-03 13:53 ` Eloitor
2 siblings, 0 replies; 4+ messages in thread
From: Eloitor @ 2025-02-03 13:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 149 bytes --]
New comment by Eloitor on void-packages repository
https://github.com/void-linux/void-packages/pull/54197#issuecomment-2631069287
Comment:
Thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-02-03 13:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-03 11:44 [PR PATCH] [WIP] m4ri: update to 20250128 Eloitor
2025-02-03 13:29 ` tornaria
2025-02-03 13:53 ` [PR PATCH] [Closed]: " Eloitor
2025-02-03 13:53 ` Eloitor
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).