mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 11:45:56 -04:00
Update to sagemath 6.4.1
This commit is contained in:
parent
3e866bf86e
commit
738094a8d8
27 changed files with 276 additions and 12243 deletions
|
@ -1,16 +1,16 @@
|
|||
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
|
||||
--- src/module_list.py.orig 2014-11-18 13:25:41.898033239 -0200
|
||||
+++ src/module_list.py 2014-11-18 13:27:10.616034410 -0200
|
||||
@@ -4,7 +4,7 @@ import os
|
||||
from distutils.extension import Extension
|
||||
from sage.env import *
|
||||
from sage.env import SAGE_LOCAL
|
||||
|
||||
-SAGE_INC = os.path.join(SAGE_LOCAL, 'include')
|
||||
+SAGE_INC = '/usr/include'
|
||||
|
||||
#########################################################
|
||||
### BLAS setup
|
||||
@@ -36,10 +36,11 @@ else:
|
||||
@@ -35,10 +35,11 @@ else:
|
||||
### Commonly used definitions
|
||||
#########################################################
|
||||
|
||||
|
@ -24,7 +24,7 @@ diff -up src/module_list.py.orig src/module_list.py
|
|||
|
||||
flint_depends = [SAGE_INC + '/flint/flint.h']
|
||||
singular_depends = [SAGE_INC + '/libsingular.h']
|
||||
@@ -70,7 +71,7 @@ givaro_extra_compile_args =['-D__STDC_LI
|
||||
@@ -71,7 +72,7 @@ givaro_extra_compile_args =['-D__STDC_LI
|
||||
### PolyBoRi settings
|
||||
#########################################################
|
||||
|
||||
|
@ -33,7 +33,7 @@ diff -up src/module_list.py.orig src/module_list.py
|
|||
polybori_major_version = '0.8'
|
||||
|
||||
|
||||
@@ -710,7 +711,7 @@ ext_modules = [
|
||||
@@ -730,7 +731,7 @@ ext_modules = [
|
||||
sources = ['sage/libs/lcalc/lcalc_Lfunction.pyx'],
|
||||
libraries = ['m', 'ntl', 'mpfr', 'gmp', 'gmpxx',
|
||||
'Lfunction'],
|
||||
|
@ -43,13 +43,13 @@ diff -up src/module_list.py.orig src/module_list.py
|
|||
language = 'c++'),
|
||||
|
||||
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
|
||||
--- src/setup.py.orig 2014-11-18 13:25:47.434033312 -0200
|
||||
+++ src/setup.py 2014-11-18 13:28:52.152035751 -0200
|
||||
@@ -36,11 +36,11 @@ except KeyError:
|
||||
compile_result_dir = None
|
||||
keep_going = False
|
||||
|
||||
-SAGE_INC = os.path.join(SAGE_LOCAL,'include')
|
||||
-SAGE_INC = os.path.join(SAGE_LOCAL, 'include')
|
||||
+SAGE_INC = '/usr/include'
|
||||
|
||||
# search for dependencies and add to gcc -I<path>
|
||||
|
@ -70,10 +70,10 @@ diff -up src/setup.py.orig src/setup.py
|
|||
m.extra_link_args = m.extra_link_args + extra_link_args
|
||||
- m.library_dirs = m.library_dirs + [os.path.join(SAGE_LOCAL, "lib")]
|
||||
+ m.library_dirs += ['c_lib', '%s/lib' % SAGE_LOCAL]
|
||||
m.include_dirs = m.include_dirs + include_dirs
|
||||
|
||||
|
||||
#############################################
|
||||
@@ -556,20 +558,6 @@ print "Discovered Python source, time: %
|
||||
@@ -579,20 +581,6 @@ print "Discovered Python source, time: %
|
||||
|
||||
|
||||
#########################################################
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue