zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 03:39:03 -04:00
Code Issues Projects Releases Packages Wiki Activity

Correct sagemath FTBFS in f25+

Browse source
This commit is contained in:
pcpa 2016-12-21 09:17:04 -05:00
parent 98d729b877
commit 09aad4ce54
2 changed files with 50 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

46
sagemath-ftbfs.patch Normal file
View file

@ -0,0 +1,46 @@
diff -up src/module_list.py.orig src/module_list.py
--- src/module_list.py.orig 2016-12-20 18:33:57.413138357 -0200
+++ src/module_list.py 2016-12-20 18:34:00.857036531 -0200
@@ -24,7 +24,7 @@ lapack_include_dirs = [ SAGE_INC + '/lap
# GNU Scientific Library
# Note we replace the built-in gslcblas with the above cblas
gsl_pc = pkgconfig.parse('gsl')
-gsl_libs = list(gsl_pc['libraries'].difference(['gslcblas']).union(cblas_libs))
+gsl_libs = list(set(gsl_pc['libraries']).difference(['gslcblas']).union(cblas_libs))
gsl_library_dirs = list(cblas_pc['library_dirs'])
gsl_include_dirs = list(gsl_pc['include_dirs'])
diff -up src/sage/structure/element_wrapper.pyx.orig src/sage/structure/element_wrapper.pyx
--- src/sage/structure/element_wrapper.pyx.orig 2016-12-20 18:33:57.416138269 -0200
+++ src/sage/structure/element_wrapper.pyx 2016-12-20 18:34:20.210464296 -0200
@@ -111,10 +111,10 @@ cdef class ElementWrapper(Element):
Element.__init__(self, parent=parent)
self.value = value
- # When self is an extension type without a __dict__ attribute,
- # this prevents self.__dict__ to return whatever crap obtained by
- # lookup through the categories ...
- __dict__ = {}
+ # When self is an extension type without a __dict__ attribute,
+ # this prevents self.__dict__ to return whatever crap obtained by
+ # lookup through the categories ...
+ __dict__ = {}
def __getstate__(self):
"""
diff -up src/setup.py.orig src/setup.py
--- src/setup.py.orig 2016-12-20 18:33:57.414138328 -0200
+++ src/setup.py 2016-12-20 18:34:00.858036501 -0200
@@ -542,9 +542,9 @@ def run_cythonize():
# Sage uses these directives (mostly for historical reasons).
Cython.Compiler.Options.embed_pos_in_docstring = True
- Cython.Compiler.Options.directive_defaults['autotestdict'] = False
- Cython.Compiler.Options.directive_defaults['cdivision'] = True
- Cython.Compiler.Options.directive_defaults['fast_getattr'] = True
+ Cython.Compiler.Options._directive_defaults['autotestdict'] = False
+ Cython.Compiler.Options._directive_defaults['cdivision'] = True
+ Cython.Compiler.Options._directive_defaults['fast_getattr'] = True
# The globals() builtin in Cython was fixed to return to the current scope,
# but Sage relies on the broken behavior of returning to the nearest
# enclosing Python scope (e.g. to perform variable injection).