Update to sagemath 7.6

This commit is contained in:
pcpa 2017-04-18 16:03:03 -04:00
parent 7e3068b9f2
commit f642d2e41d
16 changed files with 177 additions and 148 deletions

View file

@ -1,6 +1,6 @@
diff -up src/module_list.py.orig src/module_list.py
--- src/module_list.py.orig 2017-03-29 19:33:34.149118879 -0400
+++ src/module_list.py 2017-03-29 19:34:09.520120233 -0400
--- src/module_list.py.orig 2017-04-11 10:03:27.798279059 -0400
+++ src/module_list.py 2017-04-11 10:05:34.272283903 -0400
@@ -12,20 +12,14 @@ SAGE_INC = '/usr/include'
import pkgconfig
@ -26,19 +26,20 @@ diff -up src/module_list.py.orig src/module_list.py
# FFLAS-FFPACK
fflas_ffpack_pc = pkgconfig.parse('fflas-ffpack')
@@ -45,7 +39,8 @@ givaro_cflags = pkgconfig.cflags('givaro
@@ -44,7 +38,9 @@ givaro_cflags = pkgconfig.cflags('givaro
# The above cblas should already be in the list thanks to #20646
gsl_pc = pkgconfig.parse('gsl')
gsl_libs = gsl_pc['libraries']
gsl_libs.remove('gslcblas')
-gsl_library_dirs = gsl_pc['library_dirs']
+gsl_libs.remove('gslcblas')
+gsl_libs.extend(cblas_libs)
+gsl_library_dirs = list(cblas_pc['library_dirs'])
gsl_include_dirs = gsl_pc['include_dirs']
# GD image library
diff -up src/sage/misc/cython.py.orig src/sage/misc/cython.py
--- src/sage/misc/cython.py.orig 2017-03-29 19:33:27.181118612 -0400
+++ src/sage/misc/cython.py 2017-03-29 19:33:36.568118971 -0400
--- src/sage/misc/cython.py.orig 2017-04-11 10:05:44.166284281 -0400
+++ src/sage/misc/cython.py 2017-04-11 10:06:00.016284888 -0400
@@ -30,15 +30,11 @@ import pkgconfig