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

Add patch to workaround cython wrong defs (#961372)

Browse source
This commit is contained in:
pcpa 2013-05-11 12:46:42 -03:00
parent ac9063d003
commit 173cd60d9a
2 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sagemath-rh_bz_961372.patch Normal file
View file

@ -0,0 +1,14 @@
diff -up sage-5.9/spkg/build/sage-5.9/sage/ext/cdefs.pxi.orig sage-5.9/spkg/build/sage-5.9/sage/ext/cdefs.pxi
--- sage-5.9/spkg/build/sage-5.9/sage/ext/cdefs.pxi.orig 2013-04-25 10:00:51.000000000 -0300
+++ sage-5.9/spkg/build/sage-5.9/sage/ext/cdefs.pxi 2013-05-11 11:30:58.472438774 -0300
@@ -7,6 +7,9 @@ include "python.pxi"
from libc.stdio cimport *
from libc.string cimport strlen, strcpy, memset, memcpy
-from libc.math cimport sqrt, frexp, ldexp
+cdef extern from "math.h":
+ cdef double sqrt "sqrt" (double)
+ cdef double frexp "frexp" (double, int*)
+ cdef double ldexp "ldexp" (double, int)
from sage.libs.gmp.all cimport *

13
sagemath.spec
View file

@ -74,7 +74,7 @@ Name: sagemath
Group: Applications/Engineering Group: Applications/Engineering
Summary: A free open-source mathematics software system Summary: A free open-source mathematics software system
Version: 5.9 Version: 5.9
Release: 1%{?dist} Release: 2%{?dist}
# The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file # The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file
# Additionally, every $files section has a comment with the license name # Additionally, every $files section has a comment with the license name
# before files with that license # before files with that license
@ -215,6 +215,10 @@ Patch32: %{name}-cryptominisat.patch
# Adapt to m4rie 20130416 # Adapt to m4rie 20130416
Patch33: %{name}-m4rie.patch Patch33: %{name}-m4rie.patch
# Until cython is fixed for f18 and f19; just override wrong cython definition
# https://bugzilla.redhat.com/show_bug.cgi?id=961372
Patch34: %{name}-rh_bz_961372.patch
BuildRequires: 4ti2 BuildRequires: 4ti2
BuildRequires: atlas-devel BuildRequires: atlas-devel
BuildRequires: cddlib-tools BuildRequires: cddlib-tools
@ -699,6 +703,10 @@ popd
%patch33 -p1 %patch33 -p1
%endif %endif
%if 0%{?fedora} <= 19
%patch34 -p1
%endif
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# ensure proper/preferred libatlas is in linker path # ensure proper/preferred libatlas is in linker path
pushd spkg/build/sage-%{version} pushd spkg/build/sage-%{version}
@ -1415,6 +1423,9 @@ exit 0
######################################################################## ########################################################################
%changelog %changelog
* Sat May 11 2013 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 5.9-2
- Build in f18 and f18 with workaround to cython wrong defines (#961372)
* Mon May 6 2013 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 5.9-1 * Mon May 6 2013 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 5.9-1
- Update to sagemath 5.9. - Update to sagemath 5.9.
- Match upstream rename of SAGE_DEVEL to SAGE_SRC. - Match upstream rename of SAGE_DEVEL to SAGE_SRC.