[sagemath] 01/01: Link with -lflint-arb instead of -larb.

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository sagemath.

commit 6e1aa9119f1a4c0f5c4c01d0aae5c69ff58e69fa
Author: Tobias Hansen <thansen at debian.org>
Date:   Mon Aug 1 18:36:43 2016 +0000

     Link with -lflint-arb instead of -larb.
---
 debian/README.Debian            |  4 --
 debian/patches/debian-arb.patch | 82 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 8bb1a25..c132f64 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -15,10 +15,6 @@ see https://github.com/fredrik-johansson/arb/pull/55
 see debian/arb-headers.patch for a local workaround; apply it with:
 $ sudo patch -d /usr/include/ -p1 < debian/arb-headers.patch
 
-also need sage to -lflint-arb instead of -larb (or perhaps Debian needs to
-install it as libarb.so; check upstream to see what they prefer). as a temp
-workaround you can `ln -s libflint-arb.so /usr/lib/libarb.so`.
-
 Then the build (including documentation) should work, but some tests will fail.
 This is probably due to a combination of:
 
diff --git a/debian/patches/debian-arb.patch b/debian/patches/debian-arb.patch
new file mode 100644
index 0000000..1bc35c6
--- /dev/null
+++ b/debian/patches/debian-arb.patch
@@ -0,0 +1,82 @@
+Description: Link with -lflint-arb instead of -larb
+ The name of the arb library is libflint-arb in Debian.
+Author: Tobias Hansen <thansen at debian.org>
+Forwarded: not-needed
+
+
+--- a/sage/src/module_list.py
++++ b/sage/src/module_list.py
+@@ -127,7 +127,7 @@
+     "singular", "ec", "ecm",
+ ] + linbox_libs  + gsl_libs + [
+     "pari", "flint", "ratpoints", "ecl", "glpk", "ppl",
+-    "arb", "fplll", "mpfi", "mpfr", "mpc", "gmp", "gmpxx",
++    "flint-arb", "fplll", "mpfi", "mpfr", "mpc", "gmp", "gmpxx",
+     "polybori",
+     "polybori_groebner",
+     "m4rie",
+@@ -884,7 +884,7 @@
+ 
+     Extension("sage.matrix.matrix_complex_ball_dense",
+               ["sage/matrix/matrix_complex_ball_dense.pyx"],
+-              libraries=['arb', 'mpfi', 'mpfr'],
++              libraries=['flint-arb', 'mpfi', 'mpfr'],
+               include_dirs=[SAGE_INC + '/flint'],
+               language = "c++"),
+ 
+--- a/sage/src/sage/libs/arb/acb.pxd
++++ b/sage/src/sage/libs/arb/acb.pxd
+@@ -1,4 +1,4 @@
+-# distutils: libraries = arb
++# distutils: libraries = flint-arb
+ 
+ from sage.libs.arb.types cimport *
+ from sage.libs.flint.types cimport fmpz_t, fmpq_t
+--- a/sage/src/sage/libs/arb/acb_hypgeom.pxd
++++ b/sage/src/sage/libs/arb/acb_hypgeom.pxd
+@@ -1,4 +1,4 @@
+-# distutils: libraries = arb
++# distutils: libraries = flint-arb
+ 
+ from sage.libs.arb.types cimport *
+ 
+--- a/sage/src/sage/libs/arb/acb_modular.pxd
++++ b/sage/src/sage/libs/arb/acb_modular.pxd
+@@ -1,4 +1,4 @@
+-# distutils: libraries = arb
++# distutils: libraries = flint-arb
+ 
+ from sage.libs.arb.types cimport *
+ from sage.libs.flint.types cimport fmpz_poly_t
+--- a/sage/src/sage/libs/arb/arb.pxd
++++ b/sage/src/sage/libs/arb/arb.pxd
+@@ -1,4 +1,4 @@
+-# distutils: libraries = arb
++# distutils: libraries = flint-arb
+ 
+ from sage.libs.arb.types cimport *
+ from sage.libs.flint.types cimport fmpz_t, fmpq_t
+--- a/sage/src/sage/libs/arb/arf.pxd
++++ b/sage/src/sage/libs/arb/arf.pxd
+@@ -1,4 +1,4 @@
+-# distutils: libraries = arb
++# distutils: libraries = flint-arb
+ 
+ from sage.libs.arb.types cimport *
+ from sage.libs.gmp.types cimport mpz_t
+--- a/sage/src/sage/libs/arb/bernoulli.pxd
++++ b/sage/src/sage/libs/arb/bernoulli.pxd
+@@ -1,4 +1,4 @@
+-# distutils: libraries = arb
++# distutils: libraries = flint-arb
+ 
+ from ..flint.types cimport fmpq_t, ulong
+ 
+--- a/sage/src/sage/libs/arb/mag.pxd
++++ b/sage/src/sage/libs/arb/mag.pxd
+@@ -1,4 +1,4 @@
+-# distutils: libraries = arb
++# distutils: libraries = flint-arb
+ 
+ from sage.libs.arb.types cimport *
+ from sage.libs.flint.types cimport fmpz_t, fmpq_t
diff --git a/debian/patches/series b/debian/patches/series
index 40a2bdc..9e63c0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,6 +24,7 @@ debian-pari.patch
 debian-nauty.patch
 debian-gsl-cblas.patch
 debian-cysignals.patch
+debian-arb.patch
 
 # temporary patches for whatever reason
 # they will eventually be gotten rid of

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