Update to sagemath 8.0

This commit is contained in:
pcpa 2017-11-10 11:26:56 -05:00
parent b78abd5373
commit abc6d11c12
27 changed files with 290 additions and 655 deletions

View file

@ -1,7 +1,7 @@
diff -up src/module_list.py.orig src/module_list.py
--- 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'
--- src/module_list.py.orig 2017-11-08 08:34:54.635233833 -0500
+++ src/module_list.py 2017-11-08 08:36:05.888236561 -0500
@@ -12,7 +12,7 @@ SAGE_INC = '/usr/include'
import pkgconfig
# CBLAS can be one of multiple implementations
@ -10,11 +10,10 @@ diff -up src/module_list.py.orig src/module_list.py
cblas_libs = cblas_pc['libraries']
cblas_library_dirs = cblas_pc['library_dirs']
cblas_include_dirs = cblas_pc['include_dirs']
@@ -21,11 +21,9 @@ cblas_include_dirs = cblas_pc['include_d
if os.path.exists('/usr/lib/libblas.dll.a'):
cblas_libs = ['gslcblas']
-# TODO: Remove Cygwin hack by installing a suitable cblas.pc
-if os.path.exists('/usr/lib/libblas.dll.a'):
- cblas_libs = ['gslcblas']
-
-# LAPACK can be one of multiple implementations
-lapack_pc = pkgconfig.parse('lapack')
-lapack_libs = lapack_pc['libraries']
@ -26,7 +25,7 @@ diff -up src/module_list.py.orig src/module_list.py
# FFLAS-FFPACK
fflas_ffpack_pc = pkgconfig.parse('fflas-ffpack')
@@ -44,7 +38,9 @@ givaro_cflags = pkgconfig.cflags('givaro
@@ -44,7 +42,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']
@ -38,9 +37,9 @@ diff -up src/module_list.py.orig src/module_list.py
# GD image library
diff -up src/sage/misc/cython.py.orig src/sage/misc/cython.py
--- 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
--- src/sage/misc/cython.py.orig 2017-11-08 08:36:27.499237389 -0500
+++ src/sage/misc/cython.py 2017-11-08 08:36:37.240237762 -0500
@@ -30,7 +30,7 @@ import pkgconfig
# CBLAS can be one of multiple implementations
@ -49,11 +48,3 @@ diff -up src/sage/misc/cython.py.orig src/sage/misc/cython.py
cblas_libs = list(cblas_pc['libraries'])
cblas_library_dirs = list(cblas_pc['library_dirs'])
cblas_include_dirs = list(cblas_pc['include_dirs'])
-# TODO: Remove Cygwin hack by installing a suitable cblas.pc
-if os.path.exists('/usr/lib/libblas.dll.a'):
- cblas_libs = 'gslcblas'
-
standard_libs = [
'mpfr', 'gmp', 'gmpxx', 'stdc++', 'pari', 'm',
'ec', 'gsl',