mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 19:55:54 -04:00
Update spec to match Cython has update
This commit is contained in:
parent
52f8dc7839
commit
ddd84dd86a
2 changed files with 8 additions and 79 deletions
|
@ -162,29 +162,26 @@ Patch25: %{name}-givaro.patch
|
||||||
# No support for f" notation
|
# No support for f" notation
|
||||||
Patch26: %{name}-nofstring.patch
|
Patch26: %{name}-nofstring.patch
|
||||||
|
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1296652
|
|
||||||
Patch27: sig_includes.patch
|
|
||||||
|
|
||||||
# Add missing include paths
|
# Add missing include paths
|
||||||
Patch28: %{name}-includes.patch
|
Patch27: %{name}-includes.patch
|
||||||
|
|
||||||
# https://trac.sagemath.org/ticket/20926
|
# https://trac.sagemath.org/ticket/20926
|
||||||
# #error This file requires compiler and library support for the ISO C++ \
|
# #error This file requires compiler and library support for the ISO C++ \
|
||||||
# 2011 standard. This support must be enabled with the -std=c++11 \
|
# 2011 standard. This support must be enabled with the -std=c++11 \
|
||||||
# or -std=gnu++11 compiler options.
|
# or -std=gnu++11 compiler options.
|
||||||
Patch29: %{name}-gcc6.patch
|
Patch28: %{name}-gcc6.patch
|
||||||
|
|
||||||
# Use ipython3 (mostly a rediff from sagemath-6.8 sage/repl)
|
# Use ipython3 (mostly a rediff from sagemath-6.8 sage/repl)
|
||||||
Patch30: %{name}-ipython3.patch
|
Patch29: %{name}-ipython3.patch
|
||||||
|
|
||||||
# Use atlas blas
|
# Use atlas blas
|
||||||
Patch31: %{name}-atlas.patch
|
Patch30: %{name}-atlas.patch
|
||||||
|
|
||||||
# Correct side effect of sagemath-ipython3 patch
|
# Correct side effect of sagemath-ipython3 patch
|
||||||
Patch32: %{name}-is_in_terminal.patch
|
Patch31: %{name}-is_in_terminal.patch
|
||||||
|
|
||||||
# Update for python-flask-0.11.1
|
# Update for python-flask-0.11.1
|
||||||
Patch33: %{name}-flask.patch
|
Patch32: %{name}-flask.patch
|
||||||
|
|
||||||
BuildRequires: 4ti2
|
BuildRequires: 4ti2
|
||||||
BuildRequires: arb-devel
|
BuildRequires: arb-devel
|
||||||
|
@ -194,7 +191,7 @@ BuildRequires: cddlib-tools
|
||||||
BuildRequires: cliquer-devel
|
BuildRequires: cliquer-devel
|
||||||
BuildRequires: coin-or-Cbc-devel
|
BuildRequires: coin-or-Cbc-devel
|
||||||
BuildRequires: cryptominisat-devel
|
BuildRequires: cryptominisat-devel
|
||||||
BuildRequires: Cython
|
BuildRequires: Cython >= 0.24.1
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: dos2unix
|
BuildRequires: dos2unix
|
||||||
BuildRequires: dvipng
|
BuildRequires: dvipng
|
||||||
|
@ -692,13 +689,12 @@ popd
|
||||||
%patch24
|
%patch24
|
||||||
%patch25
|
%patch25
|
||||||
%patch26
|
%patch26
|
||||||
|
%patch27
|
||||||
%patch28
|
%patch28
|
||||||
%patch29
|
%patch29
|
||||||
%patch30
|
%patch30
|
||||||
%patch31
|
%patch31
|
||||||
%patch32
|
%patch32
|
||||||
%patch33
|
|
||||||
|
|
||||||
sed -e 's|@@SAGE_ROOT@@|%{SAGE_ROOT}|' \
|
sed -e 's|@@SAGE_ROOT@@|%{SAGE_ROOT}|' \
|
||||||
-e 's|@@SAGE_DOC@@|%{SAGE_DOC}|' \
|
-e 's|@@SAGE_DOC@@|%{SAGE_DOC}|' \
|
||||||
|
@ -797,7 +793,6 @@ export PYTHONPATH=%{_builddir}%{python_sitearch}:$PYTHONPATH
|
||||||
PATCH=$PWD/build/pkgs/cython/patches/pxi_sys_path.patch
|
PATCH=$PWD/build/pkgs/cython/patches/pxi_sys_path.patch
|
||||||
pushd %{_builddir}%{python_sitearch}
|
pushd %{_builddir}%{python_sitearch}
|
||||||
patch -p1 < $PATCH
|
patch -p1 < $PATCH
|
||||||
patch -p1 < %{PATCH27}
|
|
||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
|
@ -1,66 +0,0 @@
|
||||||
Additions to includes
|
|
||||||
|
|
||||||
diff --git a/Cython/Includes/libc/setjmp.pxd b/Cython/Includes/libc/setjmp.pxd
|
|
||||||
index 74d1c59..f2283fe 100644
|
|
||||||
--- a/Cython/Includes/libc/setjmp.pxd
|
|
||||||
+++ b/Cython/Includes/libc/setjmp.pxd
|
|
||||||
@@ -3,3 +3,8 @@ cdef extern from "setjmp.h" nogil:
|
|
||||||
pass
|
|
||||||
int setjmp(jmp_buf state)
|
|
||||||
void longjmp(jmp_buf state, int value)
|
|
||||||
+
|
|
||||||
+ ctypedef struct sigjmp_buf:
|
|
||||||
+ pass
|
|
||||||
+ int sigsetjmp(sigjmp_buf state, int savesigs)
|
|
||||||
+ void siglongjmp(sigjmp_buf state, int value)
|
|
||||||
diff --git a/Cython/Includes/posix/select.pxd b/Cython/Includes/posix/select.pxd
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..37bc9d3
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/Cython/Includes/posix/select.pxd
|
|
||||||
@@ -0,0 +1,19 @@
|
|
||||||
+from .types cimport sigset_t
|
|
||||||
+from .time cimport timeval, timespec
|
|
||||||
+
|
|
||||||
+cdef extern from "sys/select.h" nogil:
|
|
||||||
+ ctypedef struct fd_set:
|
|
||||||
+ pass
|
|
||||||
+
|
|
||||||
+ int FD_SETSIZE
|
|
||||||
+ void FD_SET(int, fd_set*)
|
|
||||||
+ void FD_CLR(int, fd_set*)
|
|
||||||
+ bint FD_ISSET(int, fd_set*)
|
|
||||||
+ void FD_ZERO(fd_set*)
|
|
||||||
+
|
|
||||||
+ int select(int nfds, fd_set *readfds, fd_set *writefds,
|
|
||||||
+ fd_set *exceptfds, const timeval *timeout)
|
|
||||||
+
|
|
||||||
+ int pselect(int nfds, fd_set *readfds, fd_set *writefds,
|
|
||||||
+ fd_set *exceptfds, const timespec *timeout,
|
|
||||||
+ const sigset_t *sigmask)
|
|
||||||
diff --git a/Cython/Includes/posix/signal.pxd b/Cython/Includes/posix/signal.pxd
|
|
||||||
index 9168b2f..2d6cce8 100644
|
|
||||||
--- a/Cython/Includes/posix/signal.pxd
|
|
||||||
+++ b/Cython/Includes/posix/signal.pxd
|
|
||||||
@@ -12,7 +12,7 @@ cdef extern from "signal.h" nogil:
|
|
||||||
int sigev_notify
|
|
||||||
int sigev_signo
|
|
||||||
sigval sigev_value
|
|
||||||
- void *sigev_notify_function(sigval)
|
|
||||||
+ void sigev_notify_function(sigval)
|
|
||||||
|
|
||||||
ctypedef struct siginfo_t:
|
|
||||||
int si_signo
|
|
||||||
@@ -26,10 +26,10 @@ cdef extern from "signal.h" nogil:
|
|
||||||
sigval si_value
|
|
||||||
|
|
||||||
cdef struct sigaction_t "sigaction":
|
|
||||||
- void *sa_handler(int)
|
|
||||||
+ void sa_handler(int)
|
|
||||||
+ void sa_sigaction(int, siginfo_t *, void *)
|
|
||||||
sigset_t sa_mask
|
|
||||||
int sa_flags
|
|
||||||
- void sa_sigaction(int, siginfo_t *, void *)
|
|
||||||
|
|
||||||
enum: SA_NOCLDSTOP
|
|
||||||
enum: SIG_BLOCK
|
|
Loading…
Add table
Add a link
Reference in a new issue