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 <[email protected]>
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
