mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-18 10:19:03 -04:00
eb706cd5f8
- Drop upstreamed -nauty patch. - Drop -cbc patch; upstream uses the system Cbc now. - Add -ecl patch for ecl 20.4.24.
88 lines
3.6 KiB
Diff
88 lines
3.6 KiB
Diff
diff -up src/sage/libs/ecl.pxd.orig src/sage/libs/ecl.pxd
|
|
--- src/sage/libs/ecl.pxd.orig 2020-05-20 16:33:41.000000000 -0600
|
|
+++ src/sage/libs/ecl.pxd 2020-07-07 09:05:47.078665548 -0600
|
|
@@ -39,7 +39,6 @@ cdef extern from "ecl/ecl.h":
|
|
ECL_OPT_TRAP_SIGINT,
|
|
ECL_OPT_TRAP_SIGILL,
|
|
ECL_OPT_TRAP_SIGBUS,
|
|
- ECL_OPT_TRAP_SIGCHLD,
|
|
ECL_OPT_TRAP_SIGPIPE,
|
|
ECL_OPT_TRAP_INTERRUPT_SIGNAL,
|
|
ECL_OPT_SIGNAL_HANDLING_THREAD,
|
|
@@ -53,7 +52,6 @@ cdef extern from "ecl/ecl.h":
|
|
ECL_OPT_LISP_STACK_SAFETY_AREA,
|
|
ECL_OPT_C_STACK_SIZE,
|
|
ECL_OPT_C_STACK_SAFETY_AREA,
|
|
- ECL_OPT_SIGALTSTACK_SIZE,
|
|
ECL_OPT_HEAP_SIZE,
|
|
ECL_OPT_HEAP_SAFETY_AREA,
|
|
ECL_OPT_THREAD_INTERRUPT_SIGNAL,
|
|
diff -up src/sage/libs/ecl.pyx.orig src/sage/libs/ecl.pyx
|
|
--- src/sage/libs/ecl.pyx.orig 2020-05-20 16:33:41.000000000 -0600
|
|
+++ src/sage/libs/ecl.pyx 2020-07-07 09:07:43.622621879 -0600
|
|
@@ -15,7 +15,7 @@ Library interface to Embeddable Common L
|
|
#adapted to work with pure Python types.
|
|
|
|
from libc.stdlib cimport abort
|
|
-from libc.signal cimport SIGINT, SIGBUS, SIGSEGV, SIGCHLD
|
|
+from libc.signal cimport SIGINT, SIGBUS, SIGSEGV
|
|
from libc.signal cimport raise_ as signal_raise
|
|
from posix.signal cimport sigaction, sigaction_t
|
|
cimport cysignals.signals
|
|
@@ -139,7 +139,6 @@ def test_ecl_options():
|
|
ECL_OPT_TRAP_SIGINT = 1
|
|
ECL_OPT_TRAP_SIGILL = 1
|
|
ECL_OPT_TRAP_SIGBUS = 1
|
|
- ECL_OPT_TRAP_SIGCHLD = 0
|
|
ECL_OPT_TRAP_SIGPIPE = 1
|
|
ECL_OPT_TRAP_INTERRUPT_SIGNAL = 1
|
|
ECL_OPT_SIGNAL_HANDLING_THREAD = 0
|
|
@@ -153,7 +152,6 @@ def test_ecl_options():
|
|
ECL_OPT_LISP_STACK_SAFETY_AREA = ...
|
|
ECL_OPT_C_STACK_SIZE = ...
|
|
ECL_OPT_C_STACK_SAFETY_AREA = ...
|
|
- ECL_OPT_SIGALTSTACK_SIZE = 1
|
|
ECL_OPT_HEAP_SIZE = ...
|
|
ECL_OPT_HEAP_SAFETY_AREA = ...
|
|
ECL_OPT_THREAD_INTERRUPT_SIGNAL = ...
|
|
@@ -171,8 +169,6 @@ def test_ecl_options():
|
|
ecl_get_option(ECL_OPT_TRAP_SIGILL)))
|
|
print('ECL_OPT_TRAP_SIGBUS = {0}'.format(
|
|
ecl_get_option(ECL_OPT_TRAP_SIGBUS)))
|
|
- print('ECL_OPT_TRAP_SIGCHLD = {0}'.format(
|
|
- ecl_get_option(ECL_OPT_TRAP_SIGCHLD)))
|
|
print('ECL_OPT_TRAP_SIGPIPE = {0}'.format(
|
|
ecl_get_option(ECL_OPT_TRAP_SIGPIPE)))
|
|
print('ECL_OPT_TRAP_INTERRUPT_SIGNAL = {0}'.format(
|
|
@@ -199,8 +195,6 @@ def test_ecl_options():
|
|
ecl_get_option(ECL_OPT_C_STACK_SIZE)))
|
|
print('ECL_OPT_C_STACK_SAFETY_AREA = {0}'.format(
|
|
ecl_get_option(ECL_OPT_C_STACK_SAFETY_AREA)))
|
|
- print('ECL_OPT_SIGALTSTACK_SIZE = {0}'.format(
|
|
- ecl_get_option(ECL_OPT_SIGALTSTACK_SIZE)))
|
|
print('ECL_OPT_HEAP_SIZE = {0}'.format(
|
|
ecl_get_option(ECL_OPT_HEAP_SIZE)))
|
|
print('ECL_OPT_HEAP_SAFETY_AREA = {0}'.format(
|
|
@@ -243,9 +237,6 @@ def init_ecl():
|
|
if ecl_has_booted:
|
|
raise RuntimeError("ECL is already initialized")
|
|
|
|
- # we need it to stop handling SIGCHLD
|
|
- ecl_set_option(ECL_OPT_TRAP_SIGCHLD, 0);
|
|
-
|
|
#we keep our own GMP memory functions. ECL should not claim them
|
|
ecl_set_option(ECL_OPT_SET_GMP_MEMORY_FUNCTIONS,0);
|
|
|
|
@@ -266,12 +257,6 @@ def init_ecl():
|
|
sigaction(SIGBUS, NULL, &ecl_sigbus_handler)
|
|
sigaction(SIGSEGV, NULL, &ecl_sigsegv_handler)
|
|
|
|
- #verify that no SIGCHLD handler was installed
|
|
- cdef sigaction_t sig_test
|
|
- sigaction(SIGCHLD, NULL, &sig_test)
|
|
- assert sage_action[SIGCHLD].sa_handler == NULL # Sage does not set SIGCHLD handler
|
|
- assert sig_test.sa_handler == NULL # And ECL bootup did not set one
|
|
-
|
|
#and put the Sage signal handlers back
|
|
for i in range(1,32):
|
|
sigaction(i, &sage_action[i], NULL)
|