From ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 29 Feb 2020 18:01:47 +0000
Subject: gentoo (leap year) resync : 29.02.2020

---
 .../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 ++++
 sci-mathematics/flint/files/flintxx-include.patch  | 19 ++++++
 4 files changed, 126 insertions(+)
 create mode 100644 sci-mathematics/flint/files/flint-2.5.2-memory_message.patch
 create mode 100644 sci-mathematics/flint/files/flint-2.5.2-pie.patch
 create mode 100644 sci-mathematics/flint/files/flint-2.5.2-utf8.patch
 create mode 100644 sci-mathematics/flint/files/flintxx-include.patch

(limited to 'sci-mathematics/flint/files')

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
new file mode 100644
index 000000000000..65638aa7790b
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-2.5.2-memory_message.patch
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000000..442d0254e82d
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-2.5.2-pie.patch
@@ -0,0 +1,78 @@
+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
new file mode 100644
index 000000000000..de82fc49dd38
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-2.5.2-utf8.patch
@@ -0,0 +1,13 @@
+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/flintxx-include.patch b/sci-mathematics/flint/files/flintxx-include.patch
new file mode 100644
index 000000000000..cb6744e23645
--- /dev/null
+++ b/sci-mathematics/flint/files/flintxx-include.patch
@@ -0,0 +1,19 @@
+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"
-- 
cgit v1.2.3