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

More fixes for the new givaro.

Browse source
This commit is contained in:
Jerry James 2016-03-07 07:39:14 -07:00
parent 5829ef49ab
commit 08597fb142
2 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

21
sagemath-givaro.patch
View file

@ -65,6 +65,27 @@ diff -up src/sage/libs/linbox/modular.pxd.orig src/sage/libs/linbox/modular.pxd
ModFloatField(int modulus) ModFloatField(int modulus)
ModFloatFieldElement init(ModFloatFieldElement res, int v) ModFloatFieldElement init(ModFloatFieldElement res, int v)
ModFloatFieldElement init(ModFloatFieldElement res, double v) ModFloatFieldElement init(ModFloatFieldElement res, double v)
diff -up src/sage/libs/singular/singular.pyx.orig src/sage/libs/singular/singular.pyx
--- src/sage/libs/singular/singular.pyx.orig 2015-07-26 07:34:43.000000000 -0600
+++ src/sage/libs/singular/singular.pyx 2016-03-07 06:11:58.246631802 -0700
@@ -21,6 +21,8 @@ cdef extern from "limits.h":
long INT_MAX
long INT_MIN
+from libc.stdint cimport int64_t
+
import os
from sage.libs.singular.decl cimport intvec
@@ -157,7 +159,7 @@ cdef FFgivE si2sa_GFqGivaro(number *n, r
order = cache.objectptr.cardinality() - 1
while z:
- c = cache.objectptr.initi(c, <long>napGetCoeff(z))
+ c = cache.objectptr.initi(c, <int64_t>napGetCoeff(z))
e = napGetExpFrom(z,1, _ring)
if e == 0:
ret = cache.objectptr.add(ret, c, ret)
diff -up src/sage/rings/finite_rings/element_givaro.pxd.orig src/sage/rings/finite_rings/element_givaro.pxd diff -up src/sage/rings/finite_rings/element_givaro.pxd.orig src/sage/rings/finite_rings/element_givaro.pxd
--- src/sage/rings/finite_rings/element_givaro.pxd.orig 2015-07-26 07:34:44.000000000 -0600 --- src/sage/rings/finite_rings/element_givaro.pxd.orig 2015-07-26 07:34:44.000000000 -0600
+++ src/sage/rings/finite_rings/element_givaro.pxd 2016-02-26 17:45:57.983303693 -0700 +++ src/sage/rings/finite_rings/element_givaro.pxd 2016-02-26 17:45:57.983303693 -0700

5
sagemath.spec
View file

@ -693,6 +693,11 @@ sed -e "s,SINGULARPATH=\",&%{_libdir}/Singular/LIB:," \
-e "s,\(SINGULAR_EXECUTABLE=\"\).*\",\1%{_libdir}/Singular/Singular\"," \ -e "s,\(SINGULAR_EXECUTABLE=\"\).*\",\1%{_libdir}/Singular/Singular\"," \
-i src/bin/sage-env -i src/bin/sage-env
# fix givaro interface on 32-bit platforms
if [ "%{__isa_bits}" == "32" ]; then
sed -i 's/int64_t/int32_t/' src/sage/libs/singular/singular.pyx
fi
######################################################################## ########################################################################
%build %build
export CC=%{__cc} export CC=%{__cc}