[singular] 02/04: Build with Debian's system flint and apply a Sage patch that unbreaks this

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master3-sage
in repository singular.

commit 79eb979abae0945f3af4569e5060a0d471e39548
Author: Ximin Luo <infinity0 at debian.org>
Date:   Sat Oct 8 00:37:56 2016 +0200

    Build with Debian's system flint and apply a Sage patch that unbreaks this
---
 debian/control                                     |  2 +-
 debian/patches/fix-configure-flint-detection.patch | 11 +++++
 debian/patches/flint-libs.patch                    | 50 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/spkg-install                                |  2 +-
 5 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index f3b48b2..9ae2feb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Felix Salfelder <felix at salfelder.org>
 Homepage: http://www.singular.uni-kl.de/
 Build-Depends: autotools-dev, debhelper (>= 7), patchutils (>= 0.2.25),
- libgmp3-dev, libntl-dev (>=9.6), libreadline-dev, libmpfr-dev,
+ libgmp3-dev, libntl-dev (>=9.6), libreadline-dev, libmpfr-dev, libflint-dev,
  python-polybori (>=0.8.2),
  sed (>= 4.2.1),
  sharutils,
diff --git a/debian/patches/fix-configure-flint-detection.patch b/debian/patches/fix-configure-flint-detection.patch
new file mode 100644
index 0000000..432a519
--- /dev/null
+++ b/debian/patches/fix-configure-flint-detection.patch
@@ -0,0 +1,11 @@
+--- a/Singular/configure
++++ b/Singular/configure
+@@ -9858,7 +9858,7 @@
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <flint/flint.h>
+-	int main () { if ((int) version[0] < 2) return -1; else return 0; }
++	int main () { if ((int) __FLINT_VERSION < 2) return -1; else return 0; }
+ 
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
diff --git a/debian/patches/flint-libs.patch b/debian/patches/flint-libs.patch
new file mode 100644
index 0000000..fd0bdb5
--- /dev/null
+++ b/debian/patches/flint-libs.patch
@@ -0,0 +1,50 @@
+Description: Remove spurious -lmpir flags when linking
+ Remove explicit references to -lmpir; instead use plain GMP (which may have
+ been provided by MPIR); see https://trac.sagemath.org/ticket/21188
+Author: Erik M. Bray <erik.bray at lri.fr>
+Origin: https://git.sagemath.org/sage.git/commit/?id=bc84a9124e8f6eb88e1120ebb4d36ba0ceec7d17
+Bug-SageMath: https://trac.sagemath.org/ticket/21188
+--- a/factory/configure
++++ b/factory/configure
+@@ -4883,7 +4883,7 @@
+ 
+ 	#if test "x$FLINT_HOME" != "x/usr"; then
+ 		FLINT_CFLAGS="-I${FLINT_HOME}/include"
+-		FLINT_LIBS="-L${FLINT_HOME}/lib -lflint -lmpfr -lmpir"
++		FLINT_LIBS="-L${FLINT_HOME}/lib -lflint -lmpfr -lgmp"
+ 	#else
+ 	#	FLINT_CFLAGS=
+ 	#	FLINT_LIBS="-lflint"
+--- a/factory/flint-check.m4
++++ b/factory/flint-check.m4
+@@ -51,7 +51,7 @@
+ 
+ 	#if test "x$FLINT_HOME" != "x/usr"; then
+ 		FLINT_CFLAGS="-I${FLINT_HOME}/include"
+-		FLINT_LIBS="-L${FLINT_HOME}/lib -lflint -lmpfr -lmpir"
++		FLINT_LIBS="-L${FLINT_HOME}/lib -lflint -lmpfr -lgmp"
+ 	#else
+ 	#	FLINT_CFLAGS=
+ 	#	FLINT_LIBS="-lflint"
+--- a/Singular/configure.in
++++ b/Singular/configure.in
+@@ -81,7 +81,7 @@
+ 
+ 	#if test "x$FLINT_HOME" != "x/usr"; then
+ 		FLINT_CFLAGS="-I${FLINT_HOME}/include"
+-		FLINT_LIBS="-L${FLINT_HOME}/lib -lflint -lmpfr -lmpir"
++		FLINT_LIBS="-L${FLINT_HOME}/lib -lflint -lmpfr -lgmp"
+ 	#else
+ 	#	FLINT_CFLAGS=
+ 	#	FLINT_LIBS="-lflint"		
+--- a/Singular/configure
++++ b/Singular/configure
+@@ -9827,7 +9827,7 @@
+ 
+ 	#if test "x$FLINT_HOME" != "x/usr"; then
+ 		FLINT_CFLAGS="-I${FLINT_HOME}/include"
+-		FLINT_LIBS="-L${FLINT_HOME}/lib -lflint -lmpfr -lmpir"
++		FLINT_LIBS="-L${FLINT_HOME}/lib -lflint -lmpfr -lgmp"
+ 	#else
+ 	#	FLINT_CFLAGS=
+ 	#	FLINT_LIBS="-lflint"
diff --git a/debian/patches/series b/debian/patches/series
index 505682e..92bfb0c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ slibdir.patch
 stricmp.patch
 templates.patch
 fix-headers.patch
+flint-libs.patch
diff --git a/debian/spkg-install b/debian/spkg-install
index 05183ce..fd98e66 100755
--- a/debian/spkg-install
+++ b/debian/spkg-install
@@ -145,7 +145,7 @@ config()
                 --with-apint=gmp \
                 --with-malloc=system \
                 --with-NTL \
-                --with-flint="$SAGE_LOCAL" \
+                --with-flint \
                 --without-MP \
                 --without-lex \
                 --without-Boost \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/singular.git