Update to sagemath 6.3

This commit is contained in:
pcpa 2014-08-15 13:30:04 -03:00
parent 86aa0a3b29
commit 886f9fabef
22 changed files with 1019 additions and 1023 deletions

View file

@ -1,5 +1,6 @@
--- src/module_list.py.orig 2014-05-10 15:38:39.635229222 -0300
+++ src/module_list.py 2014-05-10 15:40:06.410222998 -0300
diff -up src/module_list.py.orig src/module_list.py
--- src/module_list.py.orig 2014-08-13 11:34:14.739202143 -0300
+++ src/module_list.py 2014-08-13 11:34:18.828202300 -0300
@@ -5,7 +5,7 @@ from distutils.core import setup
from distutils.extension import Extension
from sage.env import *
@ -22,7 +23,7 @@
+numpy_depends = [get_python_lib(1) + '/numpy/core/include/numpy/_numpyconfig.h']
flint_depends = [SAGE_INC + '/flint/flint.h']
singular_depends = [SAGE_INC + '/libsingular.h', SAGE_INC + '/givaro/givconfig.h']
singular_depends = [SAGE_INC + '/libsingular.h']
@@ -70,7 +71,7 @@ givaro_extra_compile_args =['-D__STDC_LI
### PolyBoRi settings
#########################################################
@ -32,7 +33,7 @@
polybori_major_version = '0.8'
@@ -702,7 +703,7 @@ ext_modules = [
@@ -710,7 +711,7 @@ ext_modules = [
sources = ['sage/libs/lcalc/lcalc_Lfunction.pyx'],
libraries = ['m', 'ntl', 'mpfr', 'gmp', 'gmpxx',
'Lfunction'],
@ -41,8 +42,9 @@
extra_compile_args=["-O3", "-ffast-math"],
language = 'c++'),
--- src/setup.py.orig 2014-05-10 15:40:24.650221690 -0300
+++ src/setup.py 2014-05-10 15:43:52.993206746 -0300
diff -up src/setup.py.orig src/setup.py
--- src/setup.py.orig 2014-08-13 11:34:14.742202143 -0300
+++ src/setup.py 2014-08-13 11:34:55.082203688 -0300
@@ -36,11 +36,11 @@ except KeyError:
compile_result_dir = None
keep_going = False
@ -71,3 +73,24 @@
#############################################
@@ -556,20 +558,6 @@ print "Discovered Python source, time: %
#########################################################
-### Clean
-#########################################################
-
-print('Cleaning up stale installed files....')
-t = time.time()
-from sage_setup.clean import clean_install_dir
-output_dirs = SITE_PACKAGES + glob.glob(os.path.join(SAGE_SRC, 'build', 'lib*'))
-for output_dir in output_dirs:
- print('- cleaning {0}'.format(output_dir))
- clean_install_dir(output_dir, python_packages, python_modules, ext_modules)
-print('Finished cleaning, time: %.2f seconds.' % (time.time() - t))
-
-
-#########################################################
### Distutils
#########################################################