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

Add workaround to build with latest givaro and linbox

Browse source 
Workaround is to not include 64 bit related files, as it is only
building the float/double interfaces, and avoids the build failure:
/usr/include/c++/6.1.1/type_traits: In instantiation of 'struct std::make_unsigned<__int128 unsigned>':
/usr/include/givaro/modular-int64.h:46:60:   required from 'class Givaro::Modular<long int, __int128 unsigned>'
/usr/include/givaro/modular-int64.inl:32:46:   required from here
/usr/include/c++/6.1.1/type_traits:1820:62: error: invalid use of incomplete type 'class std::__make_unsigned_selector<__int128 unsigned, false, false>'
This commit is contained in:
pcpa 2016-08-21 14:00:23 -04:00
parent 61ee655ad9
commit ecfed4fc9e
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sagemath-gcc6.patch
View file

@ -15,7 +15,7 @@ diff -up src/module_list.py.orig src/module_list.py
library_dirs = cblas_library_dirs,
include_dirs = cblas_include_dirs,
- extra_compile_args = nocxx11_args + ['-DDISABLE_COMMENTATOR'] + givaro_extra_compile_args),
+ extra_compile_args = ['-std=c++11'] + ['-DDISABLE_COMMENTATOR'] + givaro_extra_compile_args),
+ extra_compile_args = ['-std=c++11', '-D__GIVARO_modular_uint64_H', '-D__GIVARO_modular_int64_H'] + ['-DDISABLE_COMMENTATOR'] + givaro_extra_compile_args),
Extension('sage.matrix.matrix_modn_dense_double',
sources = ['sage/matrix/matrix_modn_dense_double.pyx'],
@ -24,7 +24,7 @@ diff -up src/module_list.py.orig src/module_list.py
library_dirs = cblas_library_dirs,
include_dirs = cblas_include_dirs,
- extra_compile_args = nocxx11_args + ["-D_XPG6", "-DDISABLE_COMMENTATOR"]
+ extra_compile_args = ['-std=c++11'] + ["-D_XPG6", "-DDISABLE_COMMENTATOR"]
+ extra_compile_args = ['-std=c++11', '-D__GIVARO_modular_uint64_H', '-D__GIVARO_modular_int64_H'] + ["-D_XPG6", "-DDISABLE_COMMENTATOR"]
+ m4ri_extra_compile_args + givaro_extra_compile_args),
Extension('sage.matrix.matrix_modn_sparse',