commit: 02b9512fa2ef34cf631f752b2544e6ea01085094
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 14 12:10:22 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon Oct 14 12:44:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02b9512f
sci-mathematics/flint: fix the flint.pc location again
I fixed this upstream a while ago, but it's missing from the current
release, so we need to patch it again. Straight to stable because we've
done this all before.
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
.../files/flint-3.1.3_p1-fix-pc-location.patch | 26 ++++++++++++++++++++++
...nt-3.1.3_p1.ebuild => flint-3.1.3_p1-r1.ebuild} | 1 +
2 files changed, 27 insertions(+)
diff --git a/sci-mathematics/flint/files/flint-3.1.3_p1-fix-pc-location.patch
b/sci-mathematics/flint/files/flint-3.1.3_p1-fix-pc-location.patch
new file mode 100644
index 000000000000..82c9fc27d8f2
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-3.1.3_p1-fix-pc-location.patch
@@ -0,0 +1,26 @@
+From f4e0dfda90f6574048578f112bea1013d54f0987 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <mich...@orlitzky.com>
+Date: Sun, 10 Mar 2024 21:48:51 -0400
+Subject: [PATCH] CMakeLists.txt: install the pkg-config file to the configured
+ libdir
+
+Currently it installs to lib/pkgconfig, which can be incorrect on
+systems where (for example) the normal libdir is lib64 and "lib" is
+reserved for 32-bit libraries.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 30935cef47..d8dfee38df 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -537,7 +537,7 @@ set(PACKAGE_NAME ${PROJECT_NAME})
+ set(PACKAGE_VERSION ${PROJECT_VERSION})
+ configure_file(flint.pc.in flint.pc @ONLY)
+
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flint.pc DESTINATION lib/pkgconfig)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flint.pc DESTINATION
${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
+ if(BUILD_TESTING)
+ set(FLINT_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src) # To get src/test/main
diff --git a/sci-mathematics/flint/flint-3.1.3_p1.ebuild
b/sci-mathematics/flint/flint-3.1.3_p1-r1.ebuild
similarity index 97%
rename from sci-mathematics/flint/flint-3.1.3_p1.ebuild
rename to sci-mathematics/flint/flint-3.1.3_p1-r1.ebuild
index 4f60961ecba2..bca7c62b7b66 100644
--- a/sci-mathematics/flint/flint-3.1.3_p1.ebuild
+++ b/sci-mathematics/flint/flint-3.1.3_p1-r1.ebuild
@@ -48,6 +48,7 @@ DOCS="AUTHORS README.md doc/source/*.rst"
PATCHES=(
"${FILESDIR}/flint-3.0.1-find-cblas.patch"
"${FILESDIR}/flint-3.1.3_p1-c99-I.patch"
+ "${FILESDIR}/flint-3.1.3_p1-fix-pc-location.patch"
)
src_configure() {
