[sagemath] 02/02: Keep gslcblas in gsl_libs.

[Tobias Hansen]

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

thansen pushed a commit to branch experimental
in repository sagemath.

commit d03301a3647dd0561f03710dfaa89907982a183e
Author: Tobias Hansen <thansen at debian.org>
Date:   Sun Jan 22 01:00:13 2017 +0000

    Keep gslcblas in gsl_libs.
---
 debian/changelog                  |  1 +
 debian/patches/d0-gsl-cblas.patch | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2d95cf1..8d5e8bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ sagemath (7.5.1-1) UNRELEASED; urgency=medium
     - u2-fix-trivial-test-cases.patch
     - u2-fix-less-trivial-test-cases.patch
     - d0-arb.patch (patch acb_poly.pxd)
+    - d0-gsl-cblas.patch (keep gslcblas in gsl_libs)
     - d0-pari.patch
     - d0-paths-sharedata.patch
     - d0-paths.patch
diff --git a/debian/patches/d0-gsl-cblas.patch b/debian/patches/d0-gsl-cblas.patch
index 5540a2b..1a62229 100644
--- a/debian/patches/d0-gsl-cblas.patch
+++ b/debian/patches/d0-gsl-cblas.patch
@@ -1,6 +1,11 @@
-Description: Hard-code GSL CBLAS paths
+Description: Hard-code GSL CBLAS paths and keep gslcblas in gsl_libs
  Debian does not provide a pkg-config file for libgslcblas,
  so just hard-code the paths here for Sage
+ .
+ Also, when gslcblas is removed from gsl_libs we currently get this error
+ at the beginning of the doc build:
+ ImportError: /usr/lib/x86_64-linux-gnu/libgsl.so.19: undefined symbol: cblas_ctrmv
+ Does libgsl need to be linked against gslcblas?
 Author: Ximin Luo <infinity0 at debian.org>
 Forwarded: not-needed
 ---
@@ -21,6 +26,17 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  # TODO: Remove Cygwin hack by installing a suitable cblas.pc
  if os.path.exists('/usr/lib/libblas.dll.a'):
+@@ -42,9 +41,9 @@
+ # GNU Scientific Library
+ # Note we remove the built-in gslcblas
+ # The above cblas should already be in the list thanks to #20646
++# On Debian linking to libgsl currently requires also -lgslcblas so we do not remove it.
+ gsl_pc = pkgconfig.parse('gsl')
+ gsl_libs = gsl_pc['libraries']
+-gsl_libs.remove('gslcblas')
+ gsl_library_dirs = gsl_pc['library_dirs']
+ gsl_include_dirs = gsl_pc['include_dirs']
+ 
 --- a/sage/src/sage/misc/cython.py
 +++ b/sage/src/sage/misc/cython.py
 @@ -30,17 +30,16 @@

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