* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/flint/, sci-mathematics/flint/files/
@ 2017-09-24 19:17 Thomas Deutschmann
0 siblings, 0 replies; 9+ messages in thread
From: Thomas Deutschmann @ 2017-09-24 19:17 UTC (permalink / raw
To: gentoo-commits
commit: 78913ef011e8aaf88033f9ad8cdc235d118fccf7
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 19:17:22 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 19:17:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78913ef0
sci-mathematics/flint: Fix FTBFS with PIE enabled
Closes: https://bugs.gentoo.org/608704
Package-Manager: Portage-2.3.10, Repoman-2.3.3
sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch | 17 +++++++++++++++++
sci-mathematics/flint/flint-2.4.4-r1.ebuild | 3 ++-
sci-mathematics/flint/flint-2.4.5.ebuild | 3 ++-
sci-mathematics/flint/flint-2.5.2.ebuild | 2 ++
4 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch b/sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch
new file mode 100644
index 00000000000..5689e3633ee
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch
@@ -0,0 +1,17 @@
+Description: invoke $(CC) with -r and not -Wl,-r to fix FTBFS with PIE enabled
+Author: Logan Rosen <logan@ubuntu.com>
+Forwarded: yes
+
+diff --git a/Makefile.subdirs b/Makefile.subdirs
+index ec05fb0..f2d8b37 100644
+--- a/Makefile.subdirs
++++ b/Makefile.subdirs
+@@ -59,7 +59,7 @@ $(BUILD_DIR)/$(MOD_DIR)_%.o: %.c
+ $(QUIET_CC) $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -MMD -MP -MF "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$@"
+
+ $(MOD_LOBJ): $(LOBJS)
+- $(QUIET_CC) $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
++ $(QUIET_CC) $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
+
+ -include $(LOBJS:.lo=.d)
+
diff --git a/sci-mathematics/flint/flint-2.4.4-r1.ebuild b/sci-mathematics/flint/flint-2.4.4-r1.ebuild
index aca6c9be941..1068395a40c 100644
--- a/sci-mathematics/flint/flint-2.4.4-r1.ebuild
+++ b/sci-mathematics/flint/flint-2.4.4-r1.ebuild
@@ -30,7 +30,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.4.3-libdir.patch \
"${FILESDIR}"/${PN}-2.4.3-whitespaces.patch \
"${FILESDIR}"/${PN}-2.4.3-cflags-ldflags.patch \
- "${FILESDIR}"/${PN}-2.4.4-test.patch
+ "${FILESDIR}"/${PN}-2.4.4-test.patch \
+ "${FILESDIR}"/${PN}-2.4.4-PIE-FTBFS.patch
sed -i \
-e '/echo "DLPATH_ADD=/s/\$DLPATH_ADD/\\\$(CURDIR)/' \
diff --git a/sci-mathematics/flint/flint-2.4.5.ebuild b/sci-mathematics/flint/flint-2.4.5.ebuild
index a8293b9632a..b36ea8b5f2b 100644
--- a/sci-mathematics/flint/flint-2.4.5.ebuild
+++ b/sci-mathematics/flint/flint-2.4.5.ebuild
@@ -32,7 +32,8 @@ src_prepare() {
"${FILESDIR}"/${PN}-2.4.3-cflags-ldflags.patch \
"${FILESDIR}"/${PN}-2.4.4-test.patch \
"${FILESDIR}"/${PN}-2.4.5-gmp6-compat.patch \
- "${FILESDIR}"/${PN}-2.4.5-ntl62.patch
+ "${FILESDIR}"/${PN}-2.4.5-ntl62.patch \
+ "${FILESDIR}"/${PN}-2.4.4-PIE-FTBFS.patch
sed -i \
-e '/echo "DLPATH_ADD=/s/\$DLPATH_ADD/\\\$(CURDIR)/' \
diff --git a/sci-mathematics/flint/flint-2.5.2.ebuild b/sci-mathematics/flint/flint-2.5.2.ebuild
index 0217ae0600c..64f94ae79dc 100644
--- a/sci-mathematics/flint/flint-2.5.2.ebuild
+++ b/sci-mathematics/flint/flint-2.5.2.ebuild
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
)"
src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.4.4-PIE-FTBFS.patch
+
sed -i \
-e '/echo "DLPATH_ADD=/s/\$DLPATH_ADD/\\\$(CURDIR)/' \
./configure || die
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/flint/, sci-mathematics/flint/files/
@ 2020-06-17 1:42 Michael Orlitzky
0 siblings, 0 replies; 9+ messages in thread
From: Michael Orlitzky @ 2020-06-17 1:42 UTC (permalink / raw
To: gentoo-commits
commit: 3b0bafb98e2d78db75264322a5561a63d4e34d65
Author: François Bissey <frp.bissey <AT> gmail <DOT> com>
AuthorDate: Tue Jun 16 10:54:52 2020 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 01:40:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b0bafb9
sci-mathematics/flint: upstream bump to 2.6.0
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Closes: https://github.com/gentoo/gentoo/pull/16267
Closes: https://bugs.gentoo.org/728446
Signed-off-by: François René Pierre Bissey <frp.bissey <AT> gmail.com>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/flint/Manifest | 1 +
.../flint/files/flint-2.6.0-multilib-strict.patch | 20 +++++++
sci-mathematics/flint/flint-2.6.0.ebuild | 63 ++++++++++++++++++++++
3 files changed, 84 insertions(+)
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 60823eff1c3..94837defb11 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1 +1,2 @@
DIST flint-2.5.2.tar.gz 2212242 BLAKE2B 36b9b1f2acb1d79534d85884d755fddba3b8b40efbe92aeeecd7d1526cd21f0849054c30d23c565c6a13c609992cf22f56f5b640da15e1c7e6ba6840fc710d47 SHA512 cce36947b558aabecaf780171b4bbc0e1330c3b1a7e3580717584be5cab4991d33b190531c7995b224a3a440e28c4a610d6f781901e29f48ced12a9c5ba960a2
+DIST flint-2.6.0.tar.gz 4517938 BLAKE2B 25eeaae93dda01b91d7c76db6cd637ac61199f60cb169998b506eb733b0ed4dbd306c9d370caaf84dd20fbd85779d5b05de52086d82c8bc9afe67a581064462b SHA512 623655a121190d0a1f24305eee323e14f90d2c6451c174133706cde8b62fdf6363d79bfcbe6dce8ffe04bc64d0131d902917f44e0d38c1d647d982710cbc8a8a
diff --git a/sci-mathematics/flint/files/flint-2.6.0-multilib-strict.patch b/sci-mathematics/flint/files/flint-2.6.0-multilib-strict.patch
new file mode 100644
index 00000000000..84ae3dfc292
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-2.6.0-multilib-strict.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9d94776..b04fa78 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -293,10 +293,12 @@ if(NOT MSVC)
+ target_link_libraries(flint PUBLIC m)
+ endif()
+
++include(GNUInstallDirs)
++
+ install(TARGETS flint
+- RUNTIME DESTINATION bin
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib
++ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
++ LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+ )
+
+ install(FILES ${HEADERS} DESTINATION include/flint)
diff --git a/sci-mathematics/flint/flint-2.6.0.ebuild b/sci-mathematics/flint/flint-2.6.0.ebuild
new file mode 100644
index 00000000000..d6ba11ee4b1
--- /dev/null
+++ b/sci-mathematics/flint/flint-2.6.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="Fast Library for Number Theory"
+HOMEPAGE="http://www.flintlib.org/"
+SRC_URI="http://www.flintlib.org/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/14"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="doc ntl test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? (
+ dev-python/sphinx
+ app-text/texlive-core
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ )
+ ${PYTHON_DEPS}"
+DEPEND="dev-libs/gmp:=
+ dev-libs/mpfr:=
+ ntl? ( dev-libs/ntl:= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.6.0-multilib-strict.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_NTL="$(usex ntl)"
+ -DBUILD_TESTING="$(usex test)"
+ -DBUILD_DOCS="$(usex doc)"
+ )
+
+ cmake-utils_src_configure
+
+ if use doc ; then
+ HTML_DOCS="${BUILD_DIR}/html/*"
+ DOCS=(
+ "${S}"/README
+ "${S}"/AUTHORS
+ "${S}"/NEWS
+ "${BUILD_DIR}"/latex/Flint.pdf
+ )
+ fi
+}
+
+src_compile() {
+ cmake-utils_src_compile
+
+ if use doc ; then
+ cmake-utils_src_make html
+ cmake-utils_src_make pdf
+ fi
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/flint/, sci-mathematics/flint/files/
@ 2021-08-07 11:52 Michael Orlitzky
0 siblings, 0 replies; 9+ messages in thread
From: Michael Orlitzky @ 2021-08-07 11:52 UTC (permalink / raw
To: gentoo-commits
commit: 6f50af77c606fcf9477a8e8a34b9a6d698dcc3b8
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 7 03:29:28 2021 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Aug 7 11:47:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f50af77
sci-mathematics/flint: remove old "unused" versions.
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/flint/Manifest | 2 -
.../flint/files/flint-2.5.2-memory_message.patch | 16 -----
sci-mathematics/flint/files/flint-2.5.2-pie.patch | 78 ----------------------
sci-mathematics/flint/files/flint-2.5.2-utf8.patch | 13 ----
.../flint/files/flint-2.6.0-multilib-strict.patch | 20 ------
sci-mathematics/flint/files/flintxx-include.patch | 19 ------
sci-mathematics/flint/flint-2.5.2-r1.ebuild | 74 --------------------
sci-mathematics/flint/flint-2.6.3-r1.ebuild | 64 ------------------
sci-mathematics/flint/metadata.xml | 2 -
9 files changed, 288 deletions(-)
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index e1079aba8dc..bf41b8b7db5 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1,3 +1 @@
-DIST flint-2.5.2.tar.gz 2212242 BLAKE2B 36b9b1f2acb1d79534d85884d755fddba3b8b40efbe92aeeecd7d1526cd21f0849054c30d23c565c6a13c609992cf22f56f5b640da15e1c7e6ba6840fc710d47 SHA512 cce36947b558aabecaf780171b4bbc0e1330c3b1a7e3580717584be5cab4991d33b190531c7995b224a3a440e28c4a610d6f781901e29f48ced12a9c5ba960a2
-DIST flint-2.6.3.tar.gz 4526340 BLAKE2B d663b44166cd857f83c2752eb4d4f6dc45eb8de535089e5dbe9939ac1464f1d69f66b62184644fff1ecd1d171f389d5ab874873def670c702733a0eba17bfd13 SHA512 8e71570364c789b1d4eaaa5f5adf10212cab47bf1a9f45c333211035ed021a86bb7b1de1feec51e83b2e113e8168853e370f127d2d2b1e941a12aec71fe8ae9e
DIST flint-2.7.1.tar.gz 4945081 BLAKE2B 9dcc4b0062be08778cd8ada1794a73237ea091a7bff4a4673aa59eac9b414ed90e0291b9547bdf72aa30e48da11f98ff983267ea2e3dd1d75fcec00b24c86ca9 SHA512 abea97228e91089d82a9a44714e719064bef261c45f5f5b24700955bb841cc98a8182e04e6054fcbcaa3bd92f2f95a82bd5d168ec2171af6a58d4f71eb0a479a
diff --git a/sci-mathematics/flint/files/flint-2.5.2-memory_message.patch b/sci-mathematics/flint/files/flint-2.5.2-memory_message.patch
deleted file mode 100644
index 65638aa7790..00000000000
--- a/sci-mathematics/flint/files/flint-2.5.2-memory_message.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This fixes a Python 3 doctest failure in
-rings/polynomial/polynomial_integer_dense_flint.pyx: see #28334.
-See https://github.com/wbhart/flint2/pull/585 for upstream PR
-
-diff --git a/memory_manager.c b/memory_manager.c
-index 04abf8a..bece9f5 100644
---- a/memory_manager.c
-+++ b/memory_manager.c
-@@ -41,6 +41,7 @@ pthread_mutex_t register_lock;
- static void flint_memory_error()
- {
- flint_printf("Exception (FLINT memory_manager). Unable to allocate memory.\n");
-+ fflush(stdout);
- abort();
- }
-
diff --git a/sci-mathematics/flint/files/flint-2.5.2-pie.patch b/sci-mathematics/flint/files/flint-2.5.2-pie.patch
deleted file mode 100644
index 442d0254e82..00000000000
--- a/sci-mathematics/flint/files/flint-2.5.2-pie.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-In newer binutils, ld options -r and -pie conflict.
-Patch due to Jörg-Volker Peetz
-(source : https://groups.google.com/d/msg/sage-devel/TduebNoZuBE/sEULolL0BQAJ),
-packaged by Emmanuel Charpentier
-
-diff -ru flint-2.5.2-orig/fq/Makefile flint-2.5.2-new/fq/Makefile
---- flint-2.5.2-orig/fq/Makefile 2015-08-13 18:16:22.000000000 +0200
-+++ flint-2.5.2-new/fq/Makefile 2016-11-07 18:41:09.148996528 +0100
-@@ -35,7 +35,7 @@
- $(CC) $(CFLAGS) -c $(INCS) $< -o $@
-
- $(MOD_LOBJ): $(LOBJS)
-- $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
-+ $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
-
- $(BUILD_DIR)/%.lo: %.c
- $(CC) $(PICFLAG) $(CFLAGS) $(INCS) -c $< -o $@
-diff -ru flint-2.5.2-orig/fq_poly/Makefile flint-2.5.2-new/fq_poly/Makefile
---- flint-2.5.2-orig/fq_poly/Makefile 2015-08-13 18:16:22.000000000 +0200
-+++ flint-2.5.2-new/fq_poly/Makefile 2016-11-07 18:41:09.148996528 +0100
-@@ -35,7 +35,7 @@
- $(CC) $(CFLAGS) -c $(INCS) $< -o $@
-
- $(MOD_LOBJ): $(LOBJS)
-- $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
-+ $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
-
- $(BUILD_DIR)/%.lo: %.c
- $(CC) $(PICFLAG) $(CFLAGS) $(INCS) -c $< -o $@
-diff -ru flint-2.5.2-orig/Makefile.subdirs flint-2.5.2-new/Makefile.subdirs
---- flint-2.5.2-orig/Makefile.subdirs 2015-08-13 18:16:22.000000000 +0200
-+++ flint-2.5.2-new/Makefile.subdirs 2016-11-07 18:41:09.144996522 +0100
-@@ -59,7 +59,7 @@
- $(QUIET_CC) $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -MMD -MP -MF "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$@"
-
- $(MOD_LOBJ): $(LOBJS)
-- $(QUIET_CC) $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
-+ $(QUIET_CC) $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
-
- -include $(LOBJS:.lo=.d)
-
-Seulement dans flint-2.5.2-new/: Makefile.subdirs.orig
-diff -ru flint-2.5.2-orig/padic_mat/Makefile flint-2.5.2-new/padic_mat/Makefile
---- flint-2.5.2-orig/padic_mat/Makefile 2015-08-13 18:16:22.000000000 +0200
-+++ flint-2.5.2-new/padic_mat/Makefile 2016-11-07 18:41:09.148996528 +0100
-@@ -35,7 +35,7 @@
- $(CC) $(CFLAGS) -c $(INCS) $< -o $@
-
- $(MOD_LOBJ): $(LOBJS)
-- $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
-+ $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
-
- $(BUILD_DIR)/%.lo: %.c
- $(CC) $(PICFLAG) $(CFLAGS) $(INCS) -c $< -o $@
-diff -ru flint-2.5.2-orig/padic_poly/Makefile flint-2.5.2-new/padic_poly/Makefile
---- flint-2.5.2-orig/padic_poly/Makefile 2015-08-13 18:16:22.000000000 +0200
-+++ flint-2.5.2-new/padic_poly/Makefile 2016-11-07 18:41:09.148996528 +0100
-@@ -35,7 +35,7 @@
- $(CC) $(CFLAGS) -c $(INCS) $< -o $@
-
- $(MOD_LOBJ): $(LOBJS)
-- $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
-+ $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
-
- $(BUILD_DIR)/%.lo: %.c
- $(CC) $(PICFLAG) $(CFLAGS) $(INCS) -c $< -o $@
-diff -ru flint-2.5.2-orig/qadic/Makefile flint-2.5.2-new/qadic/Makefile
---- flint-2.5.2-orig/qadic/Makefile 2015-08-13 18:16:22.000000000 +0200
-+++ flint-2.5.2-new/qadic/Makefile 2016-11-07 18:41:09.148996528 +0100
-@@ -35,7 +35,7 @@
- $(CC) $(CFLAGS) -c $(INCS) $< -o $@
-
- $(MOD_LOBJ): $(LOBJS)
-- $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
-+ $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
-
- $(BUILD_DIR)/%.lo: %.c
- $(CC) $(PICFLAG) $(CFLAGS) $(INCS) -c $< -o $@
diff --git a/sci-mathematics/flint/files/flint-2.5.2-utf8.patch b/sci-mathematics/flint/files/flint-2.5.2-utf8.patch
deleted file mode 100644
index de82fc49dd3..00000000000
--- a/sci-mathematics/flint/files/flint-2.5.2-utf8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/fmpz_mat/doc/fmpz_mat.txt b/fmpz_mat/doc/fmpz_mat.txt
-index 2f07624..d741899 100644
---- a/fmpz_mat/doc/fmpz_mat.txt
-+++ b/fmpz_mat/doc/fmpz_mat.txt
-@@ -1114,7 +1114,7 @@ void fmpz_mat_gram(fmpz_mat_t B, const fmpz_mat_t A)
-
- Sets \code{B} to the Gram matrix of the $m$-dimensional lattice \code{L} in
- $n$-dimensional Euclidean space $R^n$ spanned by the rows of
-- the $m$ × $n$ matrix \code{A}. Dimensions must be compatible.
-+ the $m \times n$ matrix \code{A}. Dimensions must be compatible.
- \code{A} and \code{B} are allowed to be the same object if \code{A} is a
- square matrix.
-
diff --git a/sci-mathematics/flint/files/flint-2.6.0-multilib-strict.patch b/sci-mathematics/flint/files/flint-2.6.0-multilib-strict.patch
deleted file mode 100644
index 84ae3dfc292..00000000000
--- a/sci-mathematics/flint/files/flint-2.6.0-multilib-strict.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9d94776..b04fa78 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -293,10 +293,12 @@ if(NOT MSVC)
- target_link_libraries(flint PUBLIC m)
- endif()
-
-+include(GNUInstallDirs)
-+
- install(TARGETS flint
-- RUNTIME DESTINATION bin
-- ARCHIVE DESTINATION lib
-- LIBRARY DESTINATION lib
-+ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
-+ ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
-+ LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
- )
-
- install(FILES ${HEADERS} DESTINATION include/flint)
diff --git a/sci-mathematics/flint/files/flintxx-include.patch b/sci-mathematics/flint/files/flintxx-include.patch
deleted file mode 100644
index cb6744e2364..00000000000
--- a/sci-mathematics/flint/files/flintxx-include.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix include errors with flintxx
-
-https://github.com/wbhart/flint2/commit/c0768dc54b5ece38252857f8e7423d5ce81a43f7
-
-
-
-diff --git a/flintxx/flint_classes.h b/flintxx/flint_classes.h
-index eac2d1a..6baa392 100644
---- a/flintxx/flint_classes.h
-+++ b/flintxx/flint_classes.h
-@@ -27,7 +27,7 @@
- // Contrary to other parts of this library, they are tailored very
- // specifically towards FLINT.
-
--#include "flint.h"
-+#include "../flint.h"
- #include "mp.h"
- #include "expression.h"
- #include "expression_traits.h"
diff --git a/sci-mathematics/flint/flint-2.5.2-r1.ebuild b/sci-mathematics/flint/flint-2.5.2-r1.ebuild
deleted file mode 100644
index 4a5052ab039..00000000000
--- a/sci-mathematics/flint/flint-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Fast Library for Number Theory"
-HOMEPAGE="http://www.flintlib.org/"
-SRC_URI="http://www.flintlib.org/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/13"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="doc gc ntl static-libs"
-
-BDEPEND="doc? (
- app-text/texlive-core
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
-)"
-DEPEND="dev-libs/gmp:=
- dev-libs/mpfr:=
- gc? ( dev-libs/boehm-gc )
- ntl? ( dev-libs/ntl:= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/flintxx-include.patch"
- "${FILESDIR}/${PN}-2.5.2-pie.patch"
- "${FILESDIR}/${PN}-2.5.2-utf8.patch"
- "${FILESDIR}/${PN}-2.5.2-memory_message.patch"
-)
-
-src_prepare() {
- default
-
- # The autodetection finds "lib" first, which may e.g. contain 32-bit
- # libs during a 64-bit build.
- sed -e "s:{GMP_DIR}/lib\":{GMP_DIR}/$(get_libdir)\":g" \
- -e "s:{MPFR_DIR}/lib\":{MPFR_DIR}/$(get_libdir)\":g" \
- -e "s:{NTL_DIR}/lib\":{NTL_DIR}/$(get_libdir)\":g" \
- -e "s:{GC_DIR}/lib\":{GC_DIR}/$(get_libdir)\":g" \
- -i configure || die
-}
-
-src_configure() {
- ./configure \
- --prefix="${EPREFIX}/usr" \
- --with-gmp="${EPREFIX}/usr" \
- --with-mpfr="${EPREFIX}/usr" \
- $(usex ntl "--with-ntl=${EPREFIX}/usr" "") \
- $(use_enable static-libs static) \
- $(usex gc "--with-gc=${EPREFIX}/usr" "") \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- AR="$(tc-getAR)" \
- || die
-}
-
-src_compile() {
- emake verbose
- use doc && emake -C doc/latex
-}
-
-src_test() {
- emake AT= QUIET_CC= QUIET_CXX= QUIET_AR= check
-}
-
-src_install() {
- emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
- einstalldocs
- use doc && dodoc doc/latex/flint-manual.pdf
-}
diff --git a/sci-mathematics/flint/flint-2.6.3-r1.ebuild b/sci-mathematics/flint/flint-2.6.3-r1.ebuild
deleted file mode 100644
index dcf4d4d0e5a..00000000000
--- a/sci-mathematics/flint/flint-2.6.3-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-inherit cmake-utils python-any-r1
-
-DESCRIPTION="Fast Library for Number Theory"
-HOMEPAGE="http://www.flintlib.org/"
-SRC_URI="http://www.flintlib.org/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/14"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~x86"
-IUSE="doc ntl test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? (
- dev-python/sphinx
- app-text/texlive-core
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- dev-tex/latexmk
- )
- ${PYTHON_DEPS}"
-DEPEND="dev-libs/gmp:=
- dev-libs/mpfr:=
- ntl? ( dev-libs/ntl:= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.0-multilib-strict.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_NTL="$(usex ntl)"
- -DBUILD_TESTING="$(usex test)"
- -DBUILD_DOCS="$(usex doc)"
- )
-
- cmake-utils_src_configure
-
- if use doc ; then
- HTML_DOCS="${BUILD_DIR}/html/*"
- DOCS=(
- "${S}"/README
- "${S}"/AUTHORS
- "${S}"/NEWS
- "${BUILD_DIR}"/latex/Flint.pdf
- )
- fi
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- if use doc ; then
- cmake-utils_src_make html
- cmake-utils_src_make pdf
- fi
-}
diff --git a/sci-mathematics/flint/metadata.xml b/sci-mathematics/flint/metadata.xml
index d0d5374ab2f..276dbeb8557 100644
--- a/sci-mathematics/flint/metadata.xml
+++ b/sci-mathematics/flint/metadata.xml
@@ -18,8 +18,6 @@
<remote-id type="github">wbhart/flint2</remote-id>
</upstream>
<use>
- <flag name="gc">Enable garbage collection
- support via <pkg>dev-libs/boehm-gc</pkg></flag>
<flag name="ntl">Build NTL interface</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/flint/, sci-mathematics/flint/files/
@ 2022-12-19 14:47 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2022-12-19 14:47 UTC (permalink / raw
To: gentoo-commits
commit: c538f82307e643d0b373e7b3dee488d2e7fcae1f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 11:47:51 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 14:44:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c538f823
sci-mathematics/flint: drop 2.7.1-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-mathematics/flint/Manifest | 1 -
.../files/flint-2.7.1-fix-cmake-findgmp.patch | 146 ---------------------
sci-mathematics/flint/flint-2.7.1-r1.ebuild | 70 ----------
3 files changed, 217 deletions(-)
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 7e848b2cdf98..4106b7b4242d 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1,4 +1,3 @@
-DIST flint-2.7.1.tar.gz 4945081 BLAKE2B 9dcc4b0062be08778cd8ada1794a73237ea091a7bff4a4673aa59eac9b414ed90e0291b9547bdf72aa30e48da11f98ff983267ea2e3dd1d75fcec00b24c86ca9 SHA512 abea97228e91089d82a9a44714e719064bef261c45f5f5b24700955bb841cc98a8182e04e6054fcbcaa3bd92f2f95a82bd5d168ec2171af6a58d4f71eb0a479a
DIST flint-2.8.4.tar.gz 5212964 BLAKE2B ddd3b9dca76ddac2070d3e12dfc4c5ea1a3b505c7bf28e41489798798d65ed2a5db12e01059816d42e5d1209166d17ee6035dcf0a94d991f78df59c6ad06b271 SHA512 1f66574a5f2f27e1f3cd0a334712c0e64f4a4b8dd57179a71f9adba4c4faff23ba8da3993f51c4f44f52a588d0d1678b1e1a272e8fe3367f2abc88e9d86ad804
DIST flint-2.8.5.tar.gz 5212805 BLAKE2B 8922a2925b68d93fd35aa5b78eb0b8cbc6aa609498b8846ce4ff036c2fece3932a0eabb0f04a5c152147d8df3eccd6570832f55dafe4f7a35de135246454a83d SHA512 849fb61612f3becfde0d8afc019a9312a7ea07d3000a6bc558eb82babecd737e3af894d3084e4a57d52f7db0403d7298cbfa277b08e2b1f5497897637ed4825f
DIST flint-2.9.0.tar.gz 5283894 BLAKE2B a790437ee142d8acb5cec1e6c7d21812f8d83f5d30d1e8c07e799713e96791d87792f25fbd4ce2d0d68f6a8ee2f0cde2b8d9f8db8ab26922a48485e0e90394aa SHA512 4494cba6a4e215e817d7c74ef6834c4e05a832488f4808bbd7bea8b02a4a35d47ef3c63a4f213230c712b32842f5588c503fc1cf23e5e2ddc4a4a5a1627a02ba
diff --git a/sci-mathematics/flint/files/flint-2.7.1-fix-cmake-findgmp.patch b/sci-mathematics/flint/files/flint-2.7.1-fix-cmake-findgmp.patch
deleted file mode 100644
index ca6e56ce1970..000000000000
--- a/sci-mathematics/flint/files/flint-2.7.1-fix-cmake-findgmp.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 41c4a0869d68d894cbe74a63612df75fd1e93bdf Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Mon, 19 Apr 2021 16:56:54 -0400
-Subject: [PATCH 1/1] CMake/FindGMP.cmake: compile a test program to check the
- gmp version.
-
-The existing GMP version check consists of grepping the contents of
-the gmp.h header to parse out a few constants. This test fails, at
-least, on Gentoo, where the usual header file is a wrapper that
-includes the true header to allow for simultaneous 32/64-bit
-support.
-
-This commit updates FindGMP to compile a test program against gmp.h
-that compares version constants using the C preprocessor. If GMP is
-too old, the test program will fail to compile and CMake will know.
----
- CMake/FindGMP.cmake | 91 +++++++++++++++++++++++----------------------
- 1 file changed, 47 insertions(+), 44 deletions(-)
-
-diff --git a/CMake/FindGMP.cmake b/CMake/FindGMP.cmake
-index ce4df70f5..951151274 100644
---- a/CMake/FindGMP.cmake
-+++ b/CMake/FindGMP.cmake
-@@ -2,28 +2,23 @@
- # https://gmplib.org/
- #
- # This module supports requiring a minimum version, e.g. you can do
--# find_package(GMP 6.0.0)
--# to require version 6.0.0 to newer of GMP.
-+# find_package(GMP 6.2.1)
-+# to require version 6.2.1 to newer of GMP.
- #
- # Once done this will define
- #
- # GMP_FOUND - system has GMP lib with correct version
- # GMP_INCLUDE_DIRS - the GMP include directory
- # GMP_LIBRARIES - the GMP library
--# GMP_VERSION - GMP version
- #
--# Copyright (c) 2016 Jack Poulson, <jack.poulson@gmail.com>
--# Redistribution and use is allowed according to the terms of the BSD license.
-
--find_path(GMP_INCLUDE_DIRS NAMES gmp.h PATHS $ENV{GMPDIR} ${INCLUDE_INSTALL_DIR})
--
--# Set GMP_FIND_VERSION to 5.1.0 if no minimum version is specified
-+# Set GMP_FIND_VERSION to 6.0.0 if no minimum version is specified
- if(NOT GMP_FIND_VERSION)
- if(NOT GMP_FIND_VERSION_MAJOR)
-- set(GMP_FIND_VERSION_MAJOR 5)
-+ set(GMP_FIND_VERSION_MAJOR 6)
- endif()
- if(NOT GMP_FIND_VERSION_MINOR)
-- set(GMP_FIND_VERSION_MINOR 1)
-+ set(GMP_FIND_VERSION_MINOR 0)
- endif()
- if(NOT GMP_FIND_VERSION_PATCH)
- set(GMP_FIND_VERSION_PATCH 0)
-@@ -32,43 +27,51 @@ if(NOT GMP_FIND_VERSION)
- "${GMP_FIND_VERSION_MAJOR}.${GMP_FIND_VERSION_MINOR}.${GMP_FIND_VERSION_PATCH}")
- endif()
-
--if(GMP_INCLUDE_DIRS)
-- # Since the GMP version macros may be in a file included by gmp.h of the form
-- # gmp-.*[_]?.*.h (e.g., gmp-x86_64.h), we search each of them.
-- file(GLOB GMP_HEADERS "${GMP_INCLUDE_DIRS}/gmp.h" "${GMP_INCLUDE_DIRS}/gmp-*.h"
-- "${GMP_INCLUDE_DIRS}/x86*/gmp.h")
-- foreach(gmp_header_filename ${GMP_HEADERS})
-- file(READ "${gmp_header_filename}" _gmp_version_header)
-- string(REGEX MATCH
-- "define[ \t]+__GNU_MP_VERSION[ \t]+([0-9]+)" _gmp_major_version_match
-- "${_gmp_version_header}")
-- if(_gmp_major_version_match)
-- set(GMP_MAJOR_VERSION "${CMAKE_MATCH_1}")
-- string(REGEX MATCH "define[ \t]+__GNU_MP_VERSION_MINOR[ \t]+([0-9]+)"
-- _gmp_minor_version_match "${_gmp_version_header}")
-- set(GMP_MINOR_VERSION "${CMAKE_MATCH_1}")
-- string(REGEX MATCH "define[ \t]+__GNU_MP_VERSION_PATCHLEVEL[ \t]+([0-9]+)"
-- _gmp_patchlevel_version_match "${_gmp_version_header}")
-- set(GMP_PATCHLEVEL_VERSION "${CMAKE_MATCH_1}")
-- set(GMP_VERSION
-- ${GMP_MAJOR_VERSION}.${GMP_MINOR_VERSION}.${GMP_PATCHLEVEL_VERSION})
-- endif()
-- endforeach()
-+find_path(GMP_INCLUDE_DIRS
-+ NAMES gmp.h
-+ PATHS $ENV{GMPDIR} ${INCLUDE_INSTALL_DIR})
-
-- # Check whether found version exists and exceeds the minimum requirement
-- if(NOT GMP_VERSION)
-- set(GMP_VERSION_OK FALSE)
-- message(STATUS "GMP version was not detected")
-- elseif(${GMP_VERSION} VERSION_LESS ${GMP_FIND_VERSION})
-- set(GMP_VERSION_OK FALSE)
-- message(STATUS "GMP version ${GMP_VERSION} found in ${GMP_INCLUDE_DIRS}, "
-- "but at least version ${GMP_FIND_VERSION} is required")
-- else()
-- set(GMP_VERSION_OK TRUE)
-- endif()
-+find_library(GMP_LIBRARIES
-+ gmp
-+ PATHS $ENV{GMPDIR} ${LIB_INSTALL_DIR})
-+
-+if(GMP_INCLUDE_DIRS AND GMP_LIBRARIES)
-+
-+ # This program will fail to compile if GMP is too old.
-+ # We prefer to perform this "test" at compile-time to
-+ # avoid problems with e.g. try_run() during cross-compilation.
-+ file(WRITE ${PROJECT_BINARY_DIR}/gmp-version-check.c ""
-+ "#include <gmp.h>\n"
-+ "\n"
-+ "#define GMP_FIND_VERSION_MAJOR ${GMP_FIND_VERSION_MAJOR}\n"
-+ "#define GMP_FIND_VERSION_MINOR ${GMP_FIND_VERSION_MINOR}\n"
-+ "#define GMP_FIND_VERSION_PATCH ${GMP_FIND_VERSION_PATCH}\n"
-+ "\n"
-+ "#if __GNU_MP_VERSION < GMP_FIND_VERSION_MAJOR\n"
-+ "#error insufficient GMP major version\n"
-+ "#elif __GNU_MP_VERSION == GMP_FIND_VERSION_MAJOR\n"
-+ "#if __GNU_MP_VERSION_MINOR < GMP_FIND_VERSION_MINOR\n"
-+ "#error insufficient GMP minor version\n"
-+ "#elif __GNU_MP_VERSION_MINOR == GMP_FIND_VERSION_MINOR\n"
-+ "#if __GNU_MP_VERSION_PATCH < GMP_FIND_VERSION_PATCH\n"
-+ "#error insufficient GMP patch version\n"
-+ "#endif\n"
-+ "#endif\n"
-+ "#endif\n"
-+ "\n"
-+ "int main(int argc, char** argv) { return 0; }\n")
-+
-+ # Try to compile the test program above with the appropriate version
-+ # strings substituted in.
-+ try_compile(GMP_VERSION_OK
-+ "${PROJECT_BINARY_DIR}"
-+ "${PROJECT_BINARY_DIR}/gmp-version-check.c"
-+ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${GMP_INCLUDE_DIRS}")
- endif()
-
--find_library(GMP_LIBRARIES gmp PATHS $ENV{GMPDIR} ${LIB_INSTALL_DIR})
-+if(NOT GMP_VERSION_OK)
-+ message(STATUS "No sufficient GMP version detected")
-+endif()
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(GMP DEFAULT_MSG
---
-2.26.3
-
diff --git a/sci-mathematics/flint/flint-2.7.1-r1.ebuild b/sci-mathematics/flint/flint-2.7.1-r1.ebuild
deleted file mode 100644
index f8e7471260ea..000000000000
--- a/sci-mathematics/flint/flint-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ninja doesn't like "-lcblas" so using make.
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake python-any-r1
-
-DESCRIPTION="Fast Library for Number Theory"
-HOMEPAGE="http://www.flintlib.org/"
-SRC_URI="http://www.flintlib.org/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-
-# Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15
-SLOT="0/15"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE="doc ntl test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? (
- dev-python/sphinx
- app-text/texlive-core
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- dev-tex/latexmk
- )
- ${PYTHON_DEPS}"
-DEPEND="dev-libs/gmp:=
- dev-libs/mpfr:=
- ntl? ( dev-libs/ntl:= )
- virtual/cblas"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-fix-cmake-findgmp.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_NTL="$(usex ntl)"
- -DBUILD_TESTING="$(usex test)"
- -DBUILD_DOCS="$(usex doc)"
- -DCBLAS_INCLUDE_DIRS="${EPREFIX}/usr/include"
- -DCBLAS_LIBRARIES="-lcblas"
- )
-
- cmake_src_configure
-
- if use doc ; then
- HTML_DOCS="${BUILD_DIR}/html/*"
- DOCS=(
- "${S}"/README
- "${S}"/AUTHORS
- "${S}"/NEWS
- "${BUILD_DIR}"/latex/Flint.pdf
- )
- fi
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc ; then
- cmake_build html
- cmake_build pdf
- fi
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/flint/, sci-mathematics/flint/files/
@ 2023-12-24 4:29 Michael Orlitzky
0 siblings, 0 replies; 9+ messages in thread
From: Michael Orlitzky @ 2023-12-24 4:29 UTC (permalink / raw
To: gentoo-commits
commit: 92e78412b4cfab142f98c25a4de65386f8f54da9
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 24 04:17:42 2023 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Dec 24 04:18:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92e78412
sci-mathematics/flint: add 3.0.1
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/flint/Manifest | 1 +
.../flint/files/flint-3.0.1-find-cblas.patch | 44 ++++++++++++
sci-mathematics/flint/flint-3.0.1.ebuild | 81 ++++++++++++++++++++++
3 files changed, 126 insertions(+)
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index de7412c463e2..730cca7ed921 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1 +1,2 @@
DIST flint-2.9.0.tar.gz 5283894 BLAKE2B a790437ee142d8acb5cec1e6c7d21812f8d83f5d30d1e8c07e799713e96791d87792f25fbd4ce2d0d68f6a8ee2f0cde2b8d9f8db8ab26922a48485e0e90394aa SHA512 4494cba6a4e215e817d7c74ef6834c4e05a832488f4808bbd7bea8b02a4a35d47ef3c63a4f213230c712b32842f5588c503fc1cf23e5e2ddc4a4a5a1627a02ba
+DIST flint-3.0.1.tar.gz 7624944 BLAKE2B 0d94252075945f39af3dd2e49803cbe16aa65b108964dfc0c12bdfd9188748944c1e839401e17b974f8f6f8832e4da84d62a63f20b63cfff0ff5c2736bfd2d47 SHA512 4b5b432b962135cd708a0ce4242343f3226f0fdf73c3f541728ed4540e7ef6cb7812a48b6b46e65a8fcc1f5cae93d8bb59838d24728024cd9aa0f7b8e5c6f98f
diff --git a/sci-mathematics/flint/files/flint-3.0.1-find-cblas.patch b/sci-mathematics/flint/files/flint-3.0.1-find-cblas.patch
new file mode 100644
index 000000000000..77a9ed2e888f
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-3.0.1-find-cblas.patch
@@ -0,0 +1,44 @@
+From 5cb3535b911c78adb9c8a908104fc4be3ffbfe51 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 23 Dec 2023 14:38:46 -0500
+Subject: [PATCH 1/1] CMake/FindCBLAS.cmake: search only for cblas
+
+On Gentoo, users can "eselect cblas" to choose a cblas implementation
+at runtime. Packages build against the reference cblas, but the others
+are (by design) compatible, so we can force one to take precedence at
+runtime with an ld.so.conf entry. But that only works when consumers
+link to libcblas.so. If they link directly to (say) openblas, then
+changing how libcblas.so resolves won't help.
+
+When Flint tries to find "cblas," it looks for accelerate and openblas
+before plain cblas. That runs afoul of the scheme described above. To
+remedy it, we patch the search function so that only "cblas" is
+considered. Since virtual/cblas always pulls in the reference
+implementation, there'd be no point in altering the search order to
+consider e.g. openblas after cblas.
+---
+ CMake/FindCBLAS.cmake | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/CMake/FindCBLAS.cmake b/CMake/FindCBLAS.cmake
+index f5b5b1c..f4919f4 100644
+--- a/CMake/FindCBLAS.cmake
++++ b/CMake/FindCBLAS.cmake
+@@ -11,13 +11,11 @@
+ find_path(CBLAS_INCLUDE_DIRS NAMES cblas.h
+ HINTS CBLAS_ROOT ENV CBLAS_ROOT
+ PATHS ${INCLUDE_INSTALL_DIR} ${CMAKE_INSTALL_PREFIX}/include
+- PATH_SUFFIXES openblas cblas blis flexiblas
+ )
+
+-find_library(CBLAS_LIBRARIES NAMES accelerate openblas cblas blas blis flexiblas
++find_library(CBLAS_LIBRARIES NAMES cblas
+ HINTS CBLAS_ROOT ENV CBLAS_ROOT
+ PATHS ${LIB_INSTALL_DIR} ${CMAKE_INSTALL_PREFIX}/lib
+- PATH_SUFFIXES openblas cblas blis flexiblas
+ )
+
+ include(FindPackageHandleStandardArgs)
+--
+2.41.0
+
diff --git a/sci-mathematics/flint/flint-3.0.1.ebuild b/sci-mathematics/flint/flint-3.0.1.ebuild
new file mode 100644
index 000000000000..7f24b83f5744
--- /dev/null
+++ b/sci-mathematics/flint/flint-3.0.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic python-any-r1
+
+DESCRIPTION="Fast Library for Number Theory"
+HOMEPAGE="https://www.flintlib.org/"
+
+# flintlib.org tarballs have been broken in the past, Bill Hart suggests
+# we get them from Github (which he has control over).
+SRC_URI="https://github.com/flintlib/flint/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+
+# Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15
+SLOT="0/18"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc ntl test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+ doc? (
+ app-text/texlive-core
+ dev-python/sphinx
+ dev-tex/latexmk
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ )
+"
+DEPEND="dev-libs/gmp:=
+ dev-libs/mpfr:=
+ ntl? ( dev-libs/ntl:= )
+ virtual/cblas"
+# flint 3 includes arb and arb cannot use flint 3.
+RDEPEND="${DEPEND}
+ !sci-mathematics/arb"
+
+# The rst files are API docs, but they're very low-effort compared to
+# the PDF and HTML docs, so we ship them unconditionally and hide only
+# the painful parts behind USE=doc.
+DOCS="AUTHORS README.md doc/source/*.rst"
+
+PATCHES=( "${FILESDIR}/flint-3.0.1-find-cblas.patch" )
+
+src_configure() {
+ # https://github.com/flintlib/flint/issues/1683
+ append-cflags -Wno-error=strict-prototypes
+
+ local mycmakeargs=(
+ -DWITH_NTL="$(usex ntl)"
+ -DBUILD_TESTING="$(usex test)"
+ -DBUILD_DOCS="$(usex doc)"
+ )
+
+ cmake_src_configure
+
+ if use doc; then
+ # Avoid the "html/_source" directory that will contain a copy of
+ # the rst sources we've already installed, and also avoid
+ # installing html/objects.inv.
+ HTML_DOCS="${BUILD_DIR}/html/*.html
+ ${BUILD_DIR}/html/*.js
+ ${BUILD_DIR}/html/_static"
+ DOCS+=" ${BUILD_DIR}/latex/Flint.pdf"
+ fi
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ cmake_build html
+ cmake_build pdf
+ fi
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/flint/, sci-mathematics/flint/files/
@ 2024-03-11 2:55 Michael Orlitzky
0 siblings, 0 replies; 9+ messages in thread
From: Michael Orlitzky @ 2024-03-11 2:55 UTC (permalink / raw
To: gentoo-commits
commit: 13e806399cb8fd6a4711ea36aba899c3cc5ad41f
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 02:51:37 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 02:54:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13e80639
sci-mathematics/flint: add 3.1.0
Fixes the pkg-config install location too.
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/flint/Manifest | 1 +
.../flint/files/flint-3.1.0-fix-pc-install.patch | 29 ++++++++
sci-mathematics/flint/flint-3.1.0.ebuild | 84 ++++++++++++++++++++++
3 files changed, 114 insertions(+)
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 730cca7ed921..b1c7fc7e9dbf 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1,2 +1,3 @@
DIST flint-2.9.0.tar.gz 5283894 BLAKE2B a790437ee142d8acb5cec1e6c7d21812f8d83f5d30d1e8c07e799713e96791d87792f25fbd4ce2d0d68f6a8ee2f0cde2b8d9f8db8ab26922a48485e0e90394aa SHA512 4494cba6a4e215e817d7c74ef6834c4e05a832488f4808bbd7bea8b02a4a35d47ef3c63a4f213230c712b32842f5588c503fc1cf23e5e2ddc4a4a5a1627a02ba
DIST flint-3.0.1.tar.gz 7624944 BLAKE2B 0d94252075945f39af3dd2e49803cbe16aa65b108964dfc0c12bdfd9188748944c1e839401e17b974f8f6f8832e4da84d62a63f20b63cfff0ff5c2736bfd2d47 SHA512 4b5b432b962135cd708a0ce4242343f3226f0fdf73c3f541728ed4540e7ef6cb7812a48b6b46e65a8fcc1f5cae93d8bb59838d24728024cd9aa0f7b8e5c6f98f
+DIST flint-3.1.0.tar.gz 7585407 BLAKE2B 697be5bd88e7793eb160d5f0e2110a7b8371ef8d3ca82b576c4cc755983a660a884d35d3cbb442288caa074b7f41699f4c6bc3c244272d9e9f5755d8d209004d SHA512 1d33bb35853f4bdca047899ebb4ac9873748c6d57ad3b6aded32219261e95713fb26b394d8c86f6183b9f44db58697def07e6c565ac789461d5ccc4dca3e9ba7
diff --git a/sci-mathematics/flint/files/flint-3.1.0-fix-pc-install.patch b/sci-mathematics/flint/files/flint-3.1.0-fix-pc-install.patch
new file mode 100644
index 000000000000..5e0145cb95e7
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-3.1.0-fix-pc-install.patch
@@ -0,0 +1,29 @@
+From f4e0dfda90f6574048578f112bea1013d54f0987 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 10 Mar 2024 21:48:51 -0400
+Subject: [PATCH 1/1] 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 30935cef4..d8dfee38d 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
+--
+2.43.0
+
diff --git a/sci-mathematics/flint/flint-3.1.0.ebuild b/sci-mathematics/flint/flint-3.1.0.ebuild
new file mode 100644
index 000000000000..f95e430165ae
--- /dev/null
+++ b/sci-mathematics/flint/flint-3.1.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic python-any-r1
+
+DESCRIPTION="Fast Library for Number Theory"
+HOMEPAGE="https://www.flintlib.org/"
+
+# flintlib.org tarballs have been broken in the past, Bill Hart suggests
+# we get them from Github (which he has control over).
+SRC_URI="https://github.com/flintlib/flint/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+
+# Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15
+SLOT="0/19"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc ntl test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+ doc? (
+ app-text/texlive-core
+ dev-python/sphinx
+ dev-tex/latexmk
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ )
+"
+DEPEND="dev-libs/gmp:=
+ dev-libs/mpfr:=
+ ntl? ( dev-libs/ntl:= )
+ virtual/cblas"
+# flint 3 includes arb and arb cannot use flint 3.
+RDEPEND="${DEPEND}
+ !sci-mathematics/arb"
+
+# The rst files are API docs, but they're very low-effort compared to
+# the PDF and HTML docs, so we ship them unconditionally and hide only
+# the painful parts behind USE=doc.
+DOCS="AUTHORS README.md doc/source/*.rst"
+
+PATCHES=(
+ "${FILESDIR}/flint-3.0.1-find-cblas.patch"
+ "${FILESDIR}/${P}-fix-pc-install.patch"
+)
+
+src_configure() {
+ # https://github.com/flintlib/flint/issues/1683
+ append-cflags -Wno-error=strict-prototypes
+
+ local mycmakeargs=(
+ -DWITH_NTL="$(usex ntl)"
+ -DBUILD_TESTING="$(usex test)"
+ -DBUILD_DOCS="$(usex doc)"
+ )
+
+ cmake_src_configure
+
+ if use doc; then
+ # Avoid the "html/_source" directory that will contain a copy of
+ # the rst sources we've already installed, and also avoid
+ # installing html/objects.inv.
+ HTML_DOCS="${BUILD_DIR}/html/*.html
+ ${BUILD_DIR}/html/*.js
+ ${BUILD_DIR}/html/_static"
+ DOCS+=" ${BUILD_DIR}/latex/Flint.pdf"
+ fi
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ cmake_build html
+ cmake_build pdf
+ fi
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/flint/, sci-mathematics/flint/files/
@ 2024-06-26 22:23 Michael Orlitzky
0 siblings, 0 replies; 9+ messages in thread
From: Michael Orlitzky @ 2024-06-26 22:23 UTC (permalink / raw
To: gentoo-commits
commit: f6d99555e8a35a1080174120515c87c59dc37a5e
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 26 22:09:31 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Jun 26 22:20:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6d99555
sci-mathematics/flint: add 3.1.3_p1
Closes: https://bugs.gentoo.org/934463
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/flint/Manifest | 1 +
.../flint/files/flint-3.1.3_p1-c99-I.patch | 320 +++++++++++++++++++++
sci-mathematics/flint/flint-3.1.3_p1.ebuild | 89 ++++++
3 files changed, 410 insertions(+)
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index b1c7fc7e9dbf..9afbef59fe6e 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1,3 +1,4 @@
DIST flint-2.9.0.tar.gz 5283894 BLAKE2B a790437ee142d8acb5cec1e6c7d21812f8d83f5d30d1e8c07e799713e96791d87792f25fbd4ce2d0d68f6a8ee2f0cde2b8d9f8db8ab26922a48485e0e90394aa SHA512 4494cba6a4e215e817d7c74ef6834c4e05a832488f4808bbd7bea8b02a4a35d47ef3c63a4f213230c712b32842f5588c503fc1cf23e5e2ddc4a4a5a1627a02ba
DIST flint-3.0.1.tar.gz 7624944 BLAKE2B 0d94252075945f39af3dd2e49803cbe16aa65b108964dfc0c12bdfd9188748944c1e839401e17b974f8f6f8832e4da84d62a63f20b63cfff0ff5c2736bfd2d47 SHA512 4b5b432b962135cd708a0ce4242343f3226f0fdf73c3f541728ed4540e7ef6cb7812a48b6b46e65a8fcc1f5cae93d8bb59838d24728024cd9aa0f7b8e5c6f98f
DIST flint-3.1.0.tar.gz 7585407 BLAKE2B 697be5bd88e7793eb160d5f0e2110a7b8371ef8d3ca82b576c4cc755983a660a884d35d3cbb442288caa074b7f41699f4c6bc3c244272d9e9f5755d8d209004d SHA512 1d33bb35853f4bdca047899ebb4ac9873748c6d57ad3b6aded32219261e95713fb26b394d8c86f6183b9f44db58697def07e6c565ac789461d5ccc4dca3e9ba7
+DIST flint-3.1.3_p1.tar.gz 7588734 BLAKE2B 87acf8778e21e37c01e12b198ff81e62ab113df3e0e9c6155ff7dd505828f79d5c49d85093e261ea96397e906350caa03477e3ecbdd1fc09d6ae5c984397a2be SHA512 1b16ff2fb9cb2ac4b75513278b8c14683e8d83db39985631df14d6ea74bee4d6ea818a200321d5f0de6f1af89898f7a99dc7088f712f4c6db1a2546199aefba7
diff --git a/sci-mathematics/flint/files/flint-3.1.3_p1-c99-I.patch b/sci-mathematics/flint/files/flint-3.1.3_p1-c99-I.patch
new file mode 100644
index 000000000000..1ebe43d6243b
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-3.1.3_p1-c99-I.patch
@@ -0,0 +1,320 @@
+From 1b93e73d00881be12e04b7f13e070214a3c9e1cc Mon Sep 17 00:00:00 2001
+From: Dima Pasechnik <dima@pasechnik.info>
+Date: Wed, 19 Jun 2024 22:16:34 +0100
+Subject: [PATCH] ensure C99 compliance in headers, as 'I' is reserved
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Note that the following code
+---- cut here: save as t.c
+---- cut here
+
+fails to compile with a suffciently new compiler, e.g. clang 16 or gcc 14.
+
+$ gcc -c t.c
+In file included from t.c:1:
+/usr/include/flint/mpoly.h:1319:43: error: expected ‘)’ before ‘__extension__’
+ 1319 | void mpoly_gcd_info_init(mpoly_gcd_info_t I, slong nvars);
+ | ^
+In file included from /usr/include/flint/fmpz_types.h:15,
+ from /usr/include/flint/fmpz_mod_types.h:15,
+ from /usr/include/flint/mpoly_types.h:15,
+ from /usr/include/flint/mpoly.h:23,
+ from t.c:2:
+/usr/include/flint/mpoly.h:1319:46: error: expected ‘;’, ‘,’ or ‘)’ before ‘mp_limb_signed_t’
+ 1319 | void mpoly_gcd_info_init(mpoly_gcd_info_t I, slong nvars);
+
+...
+---
+ src/fft_small.h | 6 +++---
+ src/fmpz_mod_mpoly_factor.h | 8 ++++----
+ src/fmpz_mpoly.h | 2 +-
+ src/fmpz_mpoly_factor.h | 18 +++++++++---------
+ src/fq_nmod_mpoly_factor.h | 6 +++---
+ src/fq_zech_mpoly_factor.h | 6 +++---
+ src/mpoly.h | 18 +++++++++---------
+ src/nmod_mpoly.h | 4 ++--
+ src/nmod_mpoly_factor.h | 6 +++---
+ 9 files changed, 37 insertions(+), 37 deletions(-)
+
+diff --git a/src/fft_small.h b/src/fft_small.h
+index 3f62f2e988..b7404f196d 100644
+--- a/src/fft_small.h
++++ b/src/fft_small.h
+@@ -242,10 +242,10 @@ FLINT_INLINE double sd_fft_ctx_get_fft_index(double* d, ulong i)
+ }
+
+ /* sd_fft.c */
+-void sd_fft_trunc(const sd_fft_lctx_t Q, ulong I, ulong S, ulong k, ulong j, ulong itrunc, ulong otrunc);
++void sd_fft_trunc(const sd_fft_lctx_t Q, ulong Iv, ulong S, ulong k, ulong j, ulong itrunc, ulong otrunc);
+
+ /* sd_ifft.c */
+-void sd_ifft_trunc(const sd_fft_lctx_t Q, ulong I, ulong S, ulong k, ulong j, ulong z, ulong n, int f);
++void sd_ifft_trunc(const sd_fft_lctx_t Q, ulong Iv, ulong S, ulong k, ulong j, ulong z, ulong n, int f);
+
+ /* sd_fft_ctx.c */
+ void sd_fft_ctx_clear(sd_fft_ctx_t Q);
+@@ -428,7 +428,7 @@ typedef struct {
+
+ typedef mpn_ctx_struct mpn_ctx_t[1];
+
+-void _convert_block(ulong* Xs, sd_fft_ctx_struct* Rffts, double* d, ulong dstride, ulong np, ulong I);
++void _convert_block(ulong* Xs, sd_fft_ctx_struct* Rffts, double* d, ulong dstride, ulong np, ulong Iv);
+ ulong flint_mpn_nbits(const ulong* a, ulong an);
+ int flint_mpn_cmp_ui_2exp(const ulong* a, ulong an, ulong b, ulong e);
+ unsigned char flint_mpn_add_inplace_c(ulong* z, ulong zn, ulong* a, ulong an, unsigned char cf);
+diff --git a/src/fmpz_mod_mpoly_factor.h b/src/fmpz_mod_mpoly_factor.h
+index 359fdd1e3d..460695dd23 100644
+--- a/src/fmpz_mod_mpoly_factor.h
++++ b/src/fmpz_mod_mpoly_factor.h
+@@ -1203,15 +1203,15 @@ typedef struct {
+ typedef fmpz_mod_mpoly_pfrac_struct fmpz_mod_mpoly_pfrac_t[1];
+
+
+-int fmpz_mod_mpoly_pfrac_init(fmpz_mod_mpoly_pfrac_t I,
++int fmpz_mod_mpoly_pfrac_init(fmpz_mod_mpoly_pfrac_t Iv,
+ flint_bitcnt_t bits, slong l, slong r, const fmpz_mod_mpoly_struct * betas,
+ const fmpz * alpha, const fmpz_mod_mpoly_ctx_t ctx);
+
+-void fmpz_mod_mpoly_pfrac_clear(fmpz_mod_mpoly_pfrac_t I,
++void fmpz_mod_mpoly_pfrac_clear(fmpz_mod_mpoly_pfrac_t Iv,
+ const fmpz_mod_mpoly_ctx_t ctx);
+
+ int fmpz_mod_mpoly_pfrac(slong r, fmpz_mod_mpoly_t t, const slong * deg,
+- fmpz_mod_mpoly_pfrac_t I, const fmpz_mod_mpoly_ctx_t ctx);
++ fmpz_mod_mpoly_pfrac_t Iv, const fmpz_mod_mpoly_ctx_t ctx);
+
+ int fmpz_mod_mpoly_hlift(slong m, fmpz_mod_mpoly_struct * f, slong r,
+ const fmpz * alpha, const fmpz_mod_mpoly_t A, const slong * degs,
+@@ -1290,7 +1290,7 @@ int fmpz_mod_mpolyn_gcd_brown_smprime(
+ fmpz_mod_mpolyn_t B,
+ slong var,
+ const fmpz_mod_mpoly_ctx_t ctx,
+- const mpoly_gcd_info_t I,
++ const mpoly_gcd_info_t Iv,
+ fmpz_mod_poly_polyun_mpolyn_stack_t St);
+
+ int fmpz_mod_mpolyl_gcdp_zippel(
+diff --git a/src/fmpz_mpoly.h b/src/fmpz_mpoly.h
+index b7c9677915..4be3d05c56 100644
+--- a/src/fmpz_mpoly.h
++++ b/src/fmpz_mpoly.h
+@@ -1084,7 +1084,7 @@ void fmpz_mpoly_vec_randtest_not_zero(fmpz_mpoly_vec_t vec, flint_rand_t state,
+
+ void fmpz_mpoly_spoly(fmpz_mpoly_t res, const fmpz_mpoly_t f, const fmpz_mpoly_t g, const fmpz_mpoly_ctx_t ctx);
+ void fmpz_mpoly_vec_set_primitive_unique(fmpz_mpoly_vec_t G, const fmpz_mpoly_vec_t F, const fmpz_mpoly_ctx_t ctx);
+-void fmpz_mpoly_reduction_primitive_part(fmpz_mpoly_t res, const fmpz_mpoly_t f, const fmpz_mpoly_vec_t I, const fmpz_mpoly_ctx_t ctx);
++void fmpz_mpoly_reduction_primitive_part(fmpz_mpoly_t res, const fmpz_mpoly_t f, const fmpz_mpoly_vec_t Iv, const fmpz_mpoly_ctx_t ctx);
+ int fmpz_mpoly_vec_is_groebner(const fmpz_mpoly_vec_t G, const fmpz_mpoly_vec_t F, const fmpz_mpoly_ctx_t ctx);
+ void fmpz_mpoly_buchberger_naive(fmpz_mpoly_vec_t G, const fmpz_mpoly_vec_t F, const fmpz_mpoly_ctx_t ctx);
+ int fmpz_mpoly_buchberger_naive_with_limits(fmpz_mpoly_vec_t G, const fmpz_mpoly_vec_t F,
+diff --git a/src/fmpz_mpoly_factor.h b/src/fmpz_mpoly_factor.h
+index 0da7c1052b..a04ef8021e 100644
+--- a/src/fmpz_mpoly_factor.h
++++ b/src/fmpz_mpoly_factor.h
+@@ -298,11 +298,11 @@ void fmpz_mpoly_from_mpolyl_perm_inflate(fmpz_mpoly_t A,
+
+ int fmpz_mpolyl_gcd_brown(fmpz_mpoly_t G,
+ fmpz_mpoly_t Abar, fmpz_mpoly_t Bbar, fmpz_mpoly_t A, fmpz_mpoly_t B,
+- const fmpz_mpoly_ctx_t ctx, const mpoly_gcd_info_t I);
++ const fmpz_mpoly_ctx_t ctx, const mpoly_gcd_info_t Iv);
+
+ int fmpz_mpolyl_gcd_brown_threaded_pool(fmpz_mpoly_t G,
+ fmpz_mpoly_t Abar, fmpz_mpoly_t Bbar, fmpz_mpoly_t A, fmpz_mpoly_t B,
+- const fmpz_mpoly_ctx_t ctx, const mpoly_gcd_info_t I,
++ const fmpz_mpoly_ctx_t ctx, const mpoly_gcd_info_t Iv,
+ const thread_pool_handle * handles, slong num_handles);
+
+ int fmpz_mpolyl_gcd_zippel(fmpz_mpoly_t G, fmpz_mpoly_t Abar,
+@@ -340,15 +340,15 @@ typedef struct {
+
+ typedef fmpz_poly_pfrac_struct fmpz_poly_pfrac_t[1];
+
+-void fmpz_poly_pfrac_init(fmpz_poly_pfrac_t I);
++void fmpz_poly_pfrac_init(fmpz_poly_pfrac_t Iv);
+
+-void fmpz_poly_pfrac_clear(fmpz_poly_pfrac_t I);
++void fmpz_poly_pfrac_clear(fmpz_poly_pfrac_t Iv);
+
+-int fmpz_poly_pfrac_precompute(fmpz_poly_pfrac_t I,
++int fmpz_poly_pfrac_precompute(fmpz_poly_pfrac_t Iv,
+ const fmpz_poly_struct * b, slong r);
+
+ int fmpz_poly_pfrac_precomp(fmpz_poly_struct * c,
+- const fmpz_poly_t A, fmpz_poly_pfrac_t I);
++ const fmpz_poly_t A, fmpz_poly_pfrac_t Iv);
+
+ typedef struct {
+ flint_bitcnt_t bits;
+@@ -372,15 +372,15 @@ typedef struct {
+
+ typedef fmpz_mpoly_pfrac_struct fmpz_mpoly_pfrac_t[1];
+
+-int fmpz_mpoly_pfrac_init(fmpz_mpoly_pfrac_t I, flint_bitcnt_t bits,
++int fmpz_mpoly_pfrac_init(fmpz_mpoly_pfrac_t Iv, flint_bitcnt_t bits,
+ slong r, slong w, const fmpz_mpoly_struct * betas,
+ const fmpz * alpha, const fmpz_mpoly_ctx_t ctx);
+
+-void fmpz_mpoly_pfrac_clear(fmpz_mpoly_pfrac_t I,
++void fmpz_mpoly_pfrac_clear(fmpz_mpoly_pfrac_t Iv,
+ const fmpz_mpoly_ctx_t ctx);
+
+ int fmpz_mpoly_pfrac(slong l, fmpz_mpoly_t t, const slong * degs,
+- fmpz_mpoly_pfrac_t I, const fmpz_mpoly_ctx_t ctx);
++ fmpz_mpoly_pfrac_t Iv, const fmpz_mpoly_ctx_t ctx);
+
+ int fmpz_mpoly_hlift(slong m, fmpz_mpoly_struct * f, slong r,
+ const fmpz * alpha, const fmpz_mpoly_t A, const slong * degs,
+diff --git a/src/fq_nmod_mpoly_factor.h b/src/fq_nmod_mpoly_factor.h
+index 6289d3f1c5..29caa99aa4 100644
+--- a/src/fq_nmod_mpoly_factor.h
++++ b/src/fq_nmod_mpoly_factor.h
+@@ -427,7 +427,7 @@ typedef fq_nmod_mpoly_pfrac_struct fq_nmod_mpoly_pfrac_t[1];
+
+
+ int fq_nmod_mpoly_pfrac_init(
+- fq_nmod_mpoly_pfrac_t I,
++ fq_nmod_mpoly_pfrac_t Iv,
+ flint_bitcnt_t bits,
+ slong l, slong r,
+ const fq_nmod_mpoly_struct * betas,
+@@ -435,14 +435,14 @@ int fq_nmod_mpoly_pfrac_init(
+ const fq_nmod_mpoly_ctx_t ctx);
+
+ void fq_nmod_mpoly_pfrac_clear(
+- fq_nmod_mpoly_pfrac_t I,
++ fq_nmod_mpoly_pfrac_t Iv,
+ const fq_nmod_mpoly_ctx_t ctx);
+
+ int fq_nmod_mpoly_pfrac(
+ slong r,
+ fq_nmod_mpoly_t t,
+ const slong * deg,
+- fq_nmod_mpoly_pfrac_t I,
++ fq_nmod_mpoly_pfrac_t Iv,
+ const fq_nmod_mpoly_ctx_t ctx);
+
+ int fq_nmod_mpoly_hlift(
+diff --git a/src/fq_zech_mpoly_factor.h b/src/fq_zech_mpoly_factor.h
+index 06f31369f9..3d3c51419f 100644
+--- a/src/fq_zech_mpoly_factor.h
++++ b/src/fq_zech_mpoly_factor.h
+@@ -652,7 +652,7 @@ typedef fq_zech_mpoly_pfrac_struct fq_zech_mpoly_pfrac_t[1];
+
+
+ int fq_zech_mpoly_pfrac_init(
+- fq_zech_mpoly_pfrac_t I,
++ fq_zech_mpoly_pfrac_t Iv,
+ flint_bitcnt_t bits,
+ slong l, slong r,
+ const fq_zech_mpoly_struct * betas,
+@@ -660,14 +660,14 @@ int fq_zech_mpoly_pfrac_init(
+ const fq_zech_mpoly_ctx_t ctx);
+
+ void fq_zech_mpoly_pfrac_clear(
+- fq_zech_mpoly_pfrac_t I,
++ fq_zech_mpoly_pfrac_t Iv,
+ const fq_zech_mpoly_ctx_t ctx);
+
+ int fq_zech_mpoly_pfrac(
+ slong r,
+ fq_zech_mpoly_t t,
+ const slong * deg,
+- fq_zech_mpoly_pfrac_t I,
++ fq_zech_mpoly_pfrac_t Iv,
+ const fq_zech_mpoly_ctx_t ctx);
+
+ int fq_zech_mpoly_hlift(
+diff --git a/src/mpoly.h b/src/mpoly.h
+index b0950e3a48..fe0ccbe7c4 100644
+--- a/src/mpoly.h
++++ b/src/mpoly.h
+@@ -1363,9 +1363,9 @@ typedef struct
+
+ typedef mpoly_gcd_info_struct mpoly_gcd_info_t[1];
+
+-void mpoly_gcd_info_init(mpoly_gcd_info_t I, slong nvars);
++void mpoly_gcd_info_init(mpoly_gcd_info_t Iv, slong nvars);
+
+-void mpoly_gcd_info_clear(mpoly_gcd_info_t I);
++void mpoly_gcd_info_clear(mpoly_gcd_info_t Iv);
+
+ void mpoly_gcd_info_limits(ulong * Amax_exp, ulong * Amin_exp,
+ slong * Amax_exp_count, slong * Amin_exp_count,
+@@ -1378,25 +1378,25 @@ void mpoly_gcd_info_stride(ulong * strides,
+ const ulong * Bmax_exp, const ulong * Bmin_exp,
+ const mpoly_ctx_t mctx);
+
+-void mpoly_gcd_info_set_perm(mpoly_gcd_info_t I,
++void mpoly_gcd_info_set_perm(mpoly_gcd_info_t Iv,
+ slong Alength, slong Blength, const mpoly_ctx_t mctx);
+
+-slong mpoly_gcd_info_get_brown_upper_limit(const mpoly_gcd_info_t I,
++slong mpoly_gcd_info_get_brown_upper_limit(const mpoly_gcd_info_t Iv,
+ slong var, slong bound);
+
+-void mpoly_gcd_info_measure_hensel(mpoly_gcd_info_t I,
++void mpoly_gcd_info_measure_hensel(mpoly_gcd_info_t Iv,
+ slong Alength, slong Blength, const mpoly_ctx_t mctx);
+
+-void mpoly_gcd_info_measure_brown(mpoly_gcd_info_t I,
++void mpoly_gcd_info_measure_brown(mpoly_gcd_info_t Iv,
+ slong Alength, slong Blength, const mpoly_ctx_t mctx);
+
+-void mpoly_gcd_info_measure_bma(mpoly_gcd_info_t I,
++void mpoly_gcd_info_measure_bma(mpoly_gcd_info_t Iv,
+ slong Alength, slong Blength, const mpoly_ctx_t mctx);
+
+-void mpoly_gcd_info_measure_zippel(mpoly_gcd_info_t I,
++void mpoly_gcd_info_measure_zippel(mpoly_gcd_info_t Iv,
+ slong Alength, slong Blength, const mpoly_ctx_t mctx);
+
+-void mpoly_gcd_info_measure_zippel2(mpoly_gcd_info_t I,
++void mpoly_gcd_info_measure_zippel2(mpoly_gcd_info_t Iv,
+ slong Alength, slong Blength, const mpoly_ctx_t mctx);
+
+ int mpoly_monomial_cofactors(fmpz * Abarexps, fmpz * Bbarexps,
+diff --git a/src/nmod_mpoly.h b/src/nmod_mpoly.h
+index 2a8136e6eb..716ac9669a 100644
+--- a/src/nmod_mpoly.h
++++ b/src/nmod_mpoly.h
+@@ -1619,13 +1619,13 @@ int nmod_mpolyn_gcd_brown_smprime_bivar(
+ int nmod_mpolyn_gcd_brown_smprime(nmod_mpolyn_t G,
+ nmod_mpolyn_t Abar, nmod_mpolyn_t Bbar,
+ nmod_mpolyn_t A, nmod_mpolyn_t B, slong var,
+- const nmod_mpoly_ctx_t ctx, const mpoly_gcd_info_t I,
++ const nmod_mpoly_ctx_t ctx, const mpoly_gcd_info_t Iv,
+ nmod_poly_stack_t Sp);
+
+ int nmod_mpolyn_gcd_brown_smprime_threaded_pool(nmod_mpolyn_t G,
+ nmod_mpolyn_t Abar, nmod_mpolyn_t Bbar,
+ nmod_mpolyn_t A, nmod_mpolyn_t B, slong var,
+- const nmod_mpoly_ctx_t ctx, const mpoly_gcd_info_t I,
++ const nmod_mpoly_ctx_t ctx, const mpoly_gcd_info_t Iv,
+ const thread_pool_handle * handles, slong num_workers);
+
+ int nmod_mpolyn_gcd_brown_lgprime(nmod_mpolyn_t G,
+diff --git a/src/nmod_mpoly_factor.h b/src/nmod_mpoly_factor.h
+index a46afc860f..b16c802b9b 100644
+--- a/src/nmod_mpoly_factor.h
++++ b/src/nmod_mpoly_factor.h
+@@ -362,15 +362,15 @@ typedef struct {
+ typedef nmod_mpoly_pfrac_struct nmod_mpoly_pfrac_t[1];
+
+
+-int nmod_mpoly_pfrac_init(nmod_mpoly_pfrac_t I, flint_bitcnt_t bits,
++int nmod_mpoly_pfrac_init(nmod_mpoly_pfrac_t Iv, flint_bitcnt_t bits,
+ slong l, slong r, const nmod_mpoly_struct * betas,
+ const mp_limb_t * alpha, const nmod_mpoly_ctx_t ctx);
+
+-void nmod_mpoly_pfrac_clear(nmod_mpoly_pfrac_t I,
++void nmod_mpoly_pfrac_clear(nmod_mpoly_pfrac_t Iv,
+ const nmod_mpoly_ctx_t ctx);
+
+ int nmod_mpoly_pfrac(slong r, nmod_mpoly_t t, const slong * deg,
+- nmod_mpoly_pfrac_t I, const nmod_mpoly_ctx_t ctx);
++ nmod_mpoly_pfrac_t Iv, const nmod_mpoly_ctx_t ctx);
+
+ int nmod_mpoly_hlift(slong m, nmod_mpoly_struct * f, slong r,
+ const mp_limb_t * alpha, const nmod_mpoly_t A, const slong * degs,
diff --git a/sci-mathematics/flint/flint-3.1.3_p1.ebuild b/sci-mathematics/flint/flint-3.1.3_p1.ebuild
new file mode 100644
index 000000000000..09d8ddd97e09
--- /dev/null
+++ b/sci-mathematics/flint/flint-3.1.3_p1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic python-any-r1
+
+DESCRIPTION="Fast Library for Number Theory"
+HOMEPAGE="https://www.flintlib.org/"
+
+MY_PV="${PV/_/-}"
+SRC_URI="https://github.com/flintlib/flint/archive/refs/tags/v${MY_PV}.tar.gz
+ -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+LICENSE="LGPL-2.1+"
+
+# Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15
+SLOT="0/19"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc ntl test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+ doc? (
+ app-text/texlive-core
+ dev-python/sphinx
+ dev-tex/latexmk
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ )
+"
+DEPEND="dev-libs/gmp:=
+ dev-libs/mpfr:=
+ ntl? ( dev-libs/ntl:= )
+ virtual/cblas"
+# flint 3 includes arb and arb cannot use flint 3.
+RDEPEND="${DEPEND}
+ !sci-mathematics/arb"
+
+# The rst files are API docs, but they're very low-effort compared to
+# the PDF and HTML docs, so we ship them unconditionally and hide only
+# the painful parts behind USE=doc.
+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"
+)
+
+src_configure() {
+ # Test failures:
+ # * https://bugs.gentoo.org/934463
+ # * https://github.com/flintlib/flint/issues/2029
+ filter-flags -floop-nest-optimize \
+ -ftree-loop-linear \
+ -floop-strip-mine \
+ -floop-block \
+ -fgraphite-identity
+
+ local mycmakeargs=(
+ -DWITH_NTL="$(usex ntl)"
+ -DBUILD_TESTING="$(usex test)"
+ -DBUILD_DOCS="$(usex doc)"
+ )
+
+ cmake_src_configure
+
+ if use doc; then
+ # Avoid the "html/_source" directory that will contain a copy of
+ # the rst sources we've already installed, and also avoid
+ # installing html/objects.inv.
+ HTML_DOCS="${BUILD_DIR}/html/*.html
+ ${BUILD_DIR}/html/*.js
+ ${BUILD_DIR}/html/_static"
+ DOCS+=" ${BUILD_DIR}/latex/Flint.pdf"
+ fi
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ cmake_build html
+ cmake_build pdf
+ fi
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/flint/, sci-mathematics/flint/files/
@ 2024-06-26 22:23 Michael Orlitzky
0 siblings, 0 replies; 9+ messages in thread
From: Michael Orlitzky @ 2024-06-26 22:23 UTC (permalink / raw
To: gentoo-commits
commit: 9cd2d3ebb8a7197946e555bbf52a15585a8c9db0
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 26 22:19:17 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Jun 26 22:20:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cd2d3eb
sci-mathematics/flint: drop 2.9.0
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/flint/Manifest | 1 -
.../flint-2.9.0-remove-hardcoded-CFLAGS.patch | 69 ------------------
sci-mathematics/flint/flint-2.9.0.ebuild | 81 ----------------------
3 files changed, 151 deletions(-)
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 9afbef59fe6e..ed7a401b1771 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1,4 +1,3 @@
-DIST flint-2.9.0.tar.gz 5283894 BLAKE2B a790437ee142d8acb5cec1e6c7d21812f8d83f5d30d1e8c07e799713e96791d87792f25fbd4ce2d0d68f6a8ee2f0cde2b8d9f8db8ab26922a48485e0e90394aa SHA512 4494cba6a4e215e817d7c74ef6834c4e05a832488f4808bbd7bea8b02a4a35d47ef3c63a4f213230c712b32842f5588c503fc1cf23e5e2ddc4a4a5a1627a02ba
DIST flint-3.0.1.tar.gz 7624944 BLAKE2B 0d94252075945f39af3dd2e49803cbe16aa65b108964dfc0c12bdfd9188748944c1e839401e17b974f8f6f8832e4da84d62a63f20b63cfff0ff5c2736bfd2d47 SHA512 4b5b432b962135cd708a0ce4242343f3226f0fdf73c3f541728ed4540e7ef6cb7812a48b6b46e65a8fcc1f5cae93d8bb59838d24728024cd9aa0f7b8e5c6f98f
DIST flint-3.1.0.tar.gz 7585407 BLAKE2B 697be5bd88e7793eb160d5f0e2110a7b8371ef8d3ca82b576c4cc755983a660a884d35d3cbb442288caa074b7f41699f4c6bc3c244272d9e9f5755d8d209004d SHA512 1d33bb35853f4bdca047899ebb4ac9873748c6d57ad3b6aded32219261e95713fb26b394d8c86f6183b9f44db58697def07e6c565ac789461d5ccc4dca3e9ba7
DIST flint-3.1.3_p1.tar.gz 7588734 BLAKE2B 87acf8778e21e37c01e12b198ff81e62ab113df3e0e9c6155ff7dd505828f79d5c49d85093e261ea96397e906350caa03477e3ecbdd1fc09d6ae5c984397a2be SHA512 1b16ff2fb9cb2ac4b75513278b8c14683e8d83db39985631df14d6ea74bee4d6ea818a200321d5f0de6f1af89898f7a99dc7088f712f4c6db1a2546199aefba7
diff --git a/sci-mathematics/flint/files/flint-2.9.0-remove-hardcoded-CFLAGS.patch b/sci-mathematics/flint/files/flint-2.9.0-remove-hardcoded-CFLAGS.patch
deleted file mode 100644
index b057ea207bbd..000000000000
--- a/sci-mathematics/flint/files/flint-2.9.0-remove-hardcoded-CFLAGS.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9784633c4..641ab9ed4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,6 +1,5 @@
- cmake_minimum_required(VERSION 3.9)
-
--include(CheckIPOSupported)
- include(CheckIncludeFiles)
- include(CheckFunctionExists)
- include(CheckPrototypeDefinition)
-@@ -126,13 +125,6 @@ with open(join('${CMAKE_SOURCE_DIR}','qadic', 'CPimport.txt')) as fin:
- )
- configure_file(${CMAKE_BINARY_DIR}/CPimport.h.in ${CMAKE_BINARY_DIR}/CPimport.h COPYONLY)
-
--# Setup for flint-config.h
--check_c_compiler_flag("-mpopcnt" HAS_FLAG_MPOPCNT)
--check_c_compiler_flag("-funroll-loops" HAS_FLAG_UNROLL_LOOPS)
--
--if(HAS_FLAG_MPOPCNT)
-- set(CMAKE_REQUIRED_FLAGS "-mpopcnt")
--endif()
- # Testing __builtin_popcountl...
- check_c_source_runs([[int main(int argc, char ** argv) {
- #if defined(_WIN64)
-@@ -141,7 +133,6 @@ check_c_source_runs([[int main(int argc, char ** argv) {
- return __builtin_popcountl(argc) == 100;
- #endif
- }]] FLINT_USES_POPCNT)
--unset(CMAKE_REQUIRED_FLAGS)
-
- # fenv configuration
- check_c_source_compiles([[#include <fenv.h>
-@@ -250,13 +241,6 @@ if(BUILD_SHARED_LIBS AND WIN32)
- target_compile_definitions(flint PUBLIC "MSC_USE_DLL")
- endif()
-
--if (HAS_FLAG_MPOPCNT)
-- target_compile_options(flint PUBLIC "-mpopcnt")
--endif()
--if (HAS_FLAG_UNROLL_LOOPS)
-- target_compile_options(flint PUBLIC "-funroll-loops")
--endif()
--
- # Versioning
-
- set_target_properties(flint PROPERTIES
-@@ -279,21 +263,6 @@ elseif (WIN32)
- set_target_properties(flint PROPERTIES RUNTIME_OUTPUT_NAME "flint-${FLINT_MAJOR}")
- endif()
-
--if(NOT DEFINED IPO_SUPPORTED)
-- message(STATUS "Checking for IPO")
-- check_ipo_supported(RESULT ipo_supported LANGUAGES C)
-- if(ipo_supported)
-- message(STATUS "Checking for IPO - found")
-- else()
-- message(STATUS "Checking for IPO - not found")
-- endif()
-- set(IPO_SUPPORTED ${ipo_supported} CACHE INTERNAL "Introprocedural Optimization" FORCE)
--endif()
--
--if(IPO_SUPPORTED)
-- set_target_properties(flint PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE)
--endif()
--
- if(NOT MSVC)
- target_link_libraries(flint PUBLIC m)
- endif()
diff --git a/sci-mathematics/flint/flint-2.9.0.ebuild b/sci-mathematics/flint/flint-2.9.0.ebuild
deleted file mode 100644
index 8294eb140a41..000000000000
--- a/sci-mathematics/flint/flint-2.9.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ninja doesn't like "-lcblas" so using make.
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake python-any-r1
-
-DESCRIPTION="Fast Library for Number Theory"
-HOMEPAGE="http://www.flintlib.org/"
-
-# flintlib.org tarballs have been broken in the past, Bill Hart suggests
-# we get them from Github (which he has control over).
-SRC_URI="https://github.com/wbhart/flint2/archive/refs/tags/v${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-
-# Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15
-SLOT="0/17"
-
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc ntl test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? (
- dev-python/sphinx
- app-text/texlive-core
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- dev-tex/latexmk
- )
- ${PYTHON_DEPS}"
-DEPEND="dev-libs/gmp:=
- dev-libs/mpfr:=
- ntl? ( dev-libs/ntl:= )
- virtual/cblas"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/flint2-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-2.9.0-remove-hardcoded-CFLAGS.patch" )
-
-src_prepare() {
- # https://github.com/wbhart/flint2/issues/1140
- rm test/t-sdiv_qrnnd.c || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_NTL="$(usex ntl)"
- -DBUILD_TESTING="$(usex test)"
- -DBUILD_DOCS="$(usex doc)"
- -DCBLAS_INCLUDE_DIRS="${EPREFIX}/usr/include"
- -DCBLAS_LIBRARIES="-lcblas"
- )
-
- cmake_src_configure
-
- if use doc ; then
- HTML_DOCS="${BUILD_DIR}/html/*"
- DOCS=(
- "${S}"/README
- "${S}"/AUTHORS
- "${S}"/NEWS
- "${BUILD_DIR}"/latex/Flint.pdf
- )
- fi
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc ; then
- cmake_build html
- cmake_build pdf
- fi
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/flint/, sci-mathematics/flint/files/
@ 2024-10-14 12:44 Michael Orlitzky
0 siblings, 0 replies; 9+ messages in thread
From: Michael Orlitzky @ 2024-10-14 12:44 UTC (permalink / raw
To: gentoo-commits
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 <michael@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() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-10-14 12:44 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-07 11:52 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/flint/, sci-mathematics/flint/files/ Michael Orlitzky
-- strict thread matches above, loose matches on Subject: below --
2024-10-14 12:44 Michael Orlitzky
2024-06-26 22:23 Michael Orlitzky
2024-06-26 22:23 Michael Orlitzky
2024-03-11 2:55 Michael Orlitzky
2023-12-24 4:29 Michael Orlitzky
2022-12-19 14:47 Andreas Sturmlechner
2020-06-17 1:42 Michael Orlitzky
2017-09-24 19:17 Thomas Deutschmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox