[gentoo-commits] repo/gentoo:master commit in: sci-libs/m4rie/, sci-libs/m4rie/files/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/m4rie/, sci-libs/m4rie/files/

[Michael Orlitzky]

commit:     84f79a6a4096a5e5135bd0965e8f696e18a699b7
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 17 02:41:56 2021 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 17 02:42:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84f79a6a

sci-libs/m4rie: new revision with patch for libm linking.

Thanks to Alessandro Barbieri, François Bissey, and Martin Albrecht
(upstream) for getting this fixed quickly. This commit adds an -r1
with the backported patch and a call to eautoreconf.

Closes: https://bugs.gentoo.org/775311
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 .../m4rie/files/m4rie-20200115-link-libm.patch     | 27 ++++++++++++++++++++++
 ...ie-20200115.ebuild => m4rie-20200115-r1.ebuild} | 12 +++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/sci-libs/m4rie/files/m4rie-20200115-link-libm.patch b/sci-libs/m4rie/files/m4rie-20200115-link-libm.patch
new file mode 100644
index 00000000000..d640b508566
--- /dev/null
+++ b/sci-libs/m4rie/files/m4rie-20200115-link-libm.patch
@@ -0,0 +1,27 @@
+From afab50ea468b0b44be6e8584793c8ee98045f8f8 Mon Sep 17 00:00:00 2001
+From: "Martin R. Albrecht" <martinralbrecht@googlemail.com>
+Date: Fri, 12 Mar 2021 09:49:45 +0000
+Subject: [PATCH] we use sqrt() so link libm
+
+fixes #22
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 1f19d49..71ed81c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,6 +18,9 @@ AC_PROG_CXX
+ 
+ AC_PROG_CC_C99()
+ 
++AC_SEARCH_LIBS([sqrt], [m], [], [
++  AC_MSG_ERROR([unable to find the sqrt() function])
++])
+ 
+ if test "$ac_cv_prog_cc_c99" = "no"; then
+    AC_MSG_ERROR([C99 support is required but not found.])
+-- 
+2.10.5
+

diff --git a/sci-libs/m4rie/m4rie-20200115.ebuild b/sci-libs/m4rie/m4rie-20200115-r1.ebuild
similarity index 83%
rename from sci-libs/m4rie/m4rie-20200115.ebuild
rename to sci-libs/m4rie/m4rie-20200115-r1.ebuild
index 7030c39b71d..48f2dd3f047 100644
--- a/sci-libs/m4rie/m4rie-20200115.ebuild
+++ b/sci-libs/m4rie/m4rie-20200115-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="Fast dense matrix arithmetic over GF(2^e) for 2 <= e <= 16"
 HOMEPAGE="https://bitbucket.org/malb/m4rie/"
 SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
@@ -12,9 +14,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug static-libs"
 
-DEPEND=">=sci-libs/m4ri-20140914"
+DEPEND="sci-libs/m4ri"
 RDEPEND="${DEPEND}"
 
+# Requires eautoreconf.
+PATCHES=( "${FILESDIR}/${P}-link-libm.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	# m4rie doesn't actually have any openmp code. The configure flag
 	# stems from a mistaken belief that it needs to be there to use the

[gentoo-commits] repo/gentoo:master commit in: sci-libs/m4rie/, sci-libs/m4rie/files/

[Michael Orlitzky]

commit:     056a0f27e0ec06f2aaae218ede325211e97b12f7
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 21 04:41:36 2025 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 13:36:08 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=056a0f27

sci-libs/m4rie: add 20250103

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 sci-libs/m4rie/Manifest                            |  1 +
 .../m4rie/files/m4rie-20250103-pkgconfig.patch     | 41 ++++++++++++++++++++++
 sci-libs/m4rie/m4rie-20250103.ebuild               | 41 ++++++++++++++++++++++
 3 files changed, 83 insertions(+)

diff --git a/sci-libs/m4rie/Manifest b/sci-libs/m4rie/Manifest
index 4dda6fb591cb..b8ac2c499a96 100644
--- a/sci-libs/m4rie/Manifest
+++ b/sci-libs/m4rie/Manifest
@@ -1 +1,2 @@
 DIST m4rie-20200115.tar.gz 500702 BLAKE2B d8b1506ef9902def6577851a97dd6f7da986dce39b3250f9f9b66f9caf8f811568b7975165fb75b6b8ab3c9faf65d890f7c2254725224266f1250a0bcf18a464 SHA512 22c990cf06de9ac790f82f48e498b2bfc87fdf6834257f4e4a4c44e2446b4226438d21692d654008b58df36d8da746bba04dcf1a3d50e34ccf8c678efd5b642b
+DIST release-20250103.tar.gz 167745 BLAKE2B b4f76e51ef9561ce7fc10c0fc0f50c8ebff1c65c9e4c51d0f120db48a9b4b4417057c2bb919b6a4d1ba23f68179c59e2a5d97063063654723f210a5d10d0e5ce SHA512 8fd80fa265d234101ee56f464a59ce5aaf0f3c600e70ee9495ec490d06b758e0073a084474ad72d79d8ade5ac4421c53ed6b12cbaaaeda96287d94137c8c61b1

diff --git a/sci-libs/m4rie/files/m4rie-20250103-pkgconfig.patch b/sci-libs/m4rie/files/m4rie-20250103-pkgconfig.patch
new file mode 100644
index 000000000000..b0a8daac1ff9
--- /dev/null
+++ b/sci-libs/m4rie/files/m4rie-20250103-pkgconfig.patch
@@ -0,0 +1,41 @@
+From 4ddb0c88b6b1cb9a6c180dab1651256ce5ed15f9 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 20 Jan 2025 22:55:08 -0500
+Subject: [PATCH] m4rie.pc.in: improve compiler/linker flag handling
+
+ 1. List m4ri in Requires.private. This will automatically
+    add -lm4ri for people who are statically linking, but will
+    omit it when dynamically linking.
+
+ 2. Move $OPENMP_CFLAGS to Libs.private. Consumers of m4rie do not
+    need to enable OpenMP at compile time to avoid problems, only at
+    link time, and only when statically linking. In particular we want
+    to _avoid_ enabling OpenMP by "accident" in a larger project that
+    makes use of m4rie.
+
+ 3. Drop $M4RI_CFLAGS. There's just... no reason to add these here.
+    In theory if M4RI had some important -D flags, they would go here,
+    but at the moment it's just adding a bunch of -msse and -fopenmp
+    stuff that we do not necessarily want to use when compiling
+    consumers of m4rie.
+---
+ m4rie.pc.in | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/m4rie.pc.in b/m4rie.pc.in
+index e716441..29bbc6d 100644
+--- a/m4rie.pc.in
++++ b/m4rie.pc.in
+@@ -6,5 +6,7 @@ includedir=@includedir@
+ Name: M4RIE
+ Description: Dense linear algebra over GF(2^e).
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lm4rie -lm4ri -lm
+-Cflags: -I${includedir} @M4RI_CFLAGS@ @OPENMP_CFLAGS@
++Requires.private: m4ri >= 20240729
++Libs: -L${libdir} -lm4rie -lm
++Libs.private: @OPENMP_CFLAGS@
++Cflags: -I${includedir}
+-- 
+2.45.2
+

diff --git a/sci-libs/m4rie/m4rie-20250103.ebuild b/sci-libs/m4rie/m4rie-20250103.ebuild
new file mode 100644
index 000000000000..a66226079ae6
--- /dev/null
+++ b/sci-libs/m4rie/m4rie-20250103.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Fast dense matrix arithmetic over GF(2^e) for 2 <= e <= 16"
+HOMEPAGE="https://github.com/malb/m4rie"
+SRC_URI="https://github.com/malb/${PN}/archive/refs/tags/release-${PV}.tar.gz"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug"
+
+DEPEND=">=sci-libs/m4ri-20240729"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-pkgconfig.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# m4rie doesn't actually have any openmp code. The configure flag
+	# stems from a mistaken belief that it needs to be there to use the
+	# openmp code in m4ri.
+	econf \
+		--disable-openmp \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/m4rie/, sci-libs/m4rie/files/

[Michael Orlitzky]

commit:     8c5c967594399917fd4c0f3b13d0f391b03b88d5
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 21 19:53:22 2025 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 19:54:20 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c5c9675

sci-libs/m4rie: fix my fix for the pkgconfig file

The mr4i dependency goes in Requires, not Requires.private, because
its headers are exposed through m4rie's headers.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 ...0103-pkgconfig.patch => m4rie-20250103-pkgconfig-r1.patch} | 11 +++++------
 .../m4rie/{m4rie-20250103.ebuild => m4rie-20250103-r1.ebuild} |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/sci-libs/m4rie/files/m4rie-20250103-pkgconfig.patch b/sci-libs/m4rie/files/m4rie-20250103-pkgconfig-r1.patch
similarity index 80%
rename from sci-libs/m4rie/files/m4rie-20250103-pkgconfig.patch
rename to sci-libs/m4rie/files/m4rie-20250103-pkgconfig-r1.patch
index b0a8daac1ff9..191a90c982fc 100644
--- a/sci-libs/m4rie/files/m4rie-20250103-pkgconfig.patch
+++ b/sci-libs/m4rie/files/m4rie-20250103-pkgconfig-r1.patch
@@ -1,11 +1,10 @@
-From 4ddb0c88b6b1cb9a6c180dab1651256ce5ed15f9 Mon Sep 17 00:00:00 2001
+From e399e88566a0a96ec8d0ee010052a987c5d83e0f Mon Sep 17 00:00:00 2001
 From: Michael Orlitzky <michael@orlitzky.com>
 Date: Mon, 20 Jan 2025 22:55:08 -0500
 Subject: [PATCH] m4rie.pc.in: improve compiler/linker flag handling
 
- 1. List m4ri in Requires.private. This will automatically
-    add -lm4ri for people who are statically linking, but will
-    omit it when dynamically linking.
+ 1. List m4ri in Requires. This will automatically add -lm4ri during
+    linking.
 
  2. Move $OPENMP_CFLAGS to Libs.private. Consumers of m4rie do not
     need to enable OpenMP at compile time to avoid problems, only at
@@ -23,7 +22,7 @@ Subject: [PATCH] m4rie.pc.in: improve compiler/linker flag handling
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/m4rie.pc.in b/m4rie.pc.in
-index e716441..29bbc6d 100644
+index e716441..57436ef 100644
 --- a/m4rie.pc.in
 +++ b/m4rie.pc.in
 @@ -6,5 +6,7 @@ includedir=@includedir@
@@ -32,7 +31,7 @@ index e716441..29bbc6d 100644
  Version: @PACKAGE_VERSION@
 -Libs: -L${libdir} -lm4rie -lm4ri -lm
 -Cflags: -I${includedir} @M4RI_CFLAGS@ @OPENMP_CFLAGS@
-+Requires.private: m4ri >= 20240729
++Requires: m4ri >= 20240729
 +Libs: -L${libdir} -lm4rie -lm
 +Libs.private: @OPENMP_CFLAGS@
 +Cflags: -I${includedir}

diff --git a/sci-libs/m4rie/m4rie-20250103.ebuild b/sci-libs/m4rie/m4rie-20250103-r1.ebuild
similarity index 94%
rename from sci-libs/m4rie/m4rie-20250103.ebuild
rename to sci-libs/m4rie/m4rie-20250103-r1.ebuild
index a66226079ae6..2751bfeee7d5 100644
--- a/sci-libs/m4rie/m4rie-20250103.ebuild
+++ b/sci-libs/m4rie/m4rie-20250103-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="debug"
 DEPEND=">=sci-libs/m4ri-20240729"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-pkgconfig.patch" )
+PATCHES=( "${FILESDIR}/${P}-pkgconfig-r1.patch" )
 
 src_prepare() {
 	default