mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-17 01:39:02 -04:00
66 lines
2.8 KiB
Diff
66 lines
2.8 KiB
Diff
diff -up src/sage/libs/gap/util.pyx.orig src/sage/libs/gap/util.pyx
|
|
--- src/sage/libs/gap/util.pyx.orig 2015-07-26 07:34:43.000000000 -0600
|
|
+++ src/sage/libs/gap/util.pyx 2016-04-07 17:49:52.497518812 -0600
|
|
@@ -153,18 +153,9 @@ def gap_root():
|
|
|
|
sage: from sage.libs.gap.util import gap_root
|
|
sage: gap_root() # random output
|
|
- '/home/vbraun/opt/sage-5.3.rc0/local/gap/latest'
|
|
+ '/usr/lib/gap'
|
|
"""
|
|
- import os.path
|
|
- gapdir = os.path.join(SAGE_LOCAL, 'gap', 'latest')
|
|
- if os.path.exists(gapdir):
|
|
- return gapdir
|
|
- print 'The gap-4.5.5.spkg (or later) seems to be not installed!'
|
|
- gap_sh = open(os.path.join(SAGE_LOCAL, 'bin', 'gap')).read().splitlines()
|
|
- gapdir = filter(lambda dir:dir.strip().startswith('GAP_DIR'), gap_sh)[0]
|
|
- gapdir = gapdir.split('"')[1]
|
|
- gapdir = gapdir.replace('$SAGE_LOCAL', SAGE_LOCAL)
|
|
- return gapdir
|
|
+ return '/usr/lib/gap'
|
|
|
|
|
|
cdef initialize():
|
|
@@ -280,7 +271,7 @@ cdef libGAP_Obj gap_eval(str gap_string)
|
|
libgap_start_interaction(cmd)
|
|
try:
|
|
sig_on()
|
|
- status = libGAP_ReadEvalCommand(libGAP_BottomLVars)
|
|
+ status = libGAP_ReadEvalCommand(libGAP_BottomLVars, NULL)
|
|
if status != libGAP_STATUS_END:
|
|
libgap_call_error_handler()
|
|
sig_off()
|
|
@@ -464,7 +455,7 @@ def command(command_string):
|
|
libgap_start_interaction(cmd)
|
|
try:
|
|
sig_on()
|
|
- status = libGAP_ReadEvalCommand(libGAP_BottomLVars)
|
|
+ status = libGAP_ReadEvalCommand(libGAP_BottomLVars, NULL)
|
|
if status != libGAP_STATUS_END:
|
|
libgap_call_error_handler()
|
|
sig_off()
|
|
diff -up src/sage/libs/gap/gap_includes.pxd.orig src/sage/libs/gap/gap_includes.pxd
|
|
--- src/sage/libs/gap/gap_includes.pxd.orig 2015-07-26 07:34:43.000000000 -0600
|
|
+++ src/sage/libs/gap/gap_includes.pxd 2016-04-07 17:50:43.958388846 -0600
|
|
@@ -131,7 +131,7 @@ cdef extern from "gap/objects.h":
|
|
cdef int libGAP_LAST_TESTING_TNUM
|
|
|
|
cdef extern from "gap/read.h":
|
|
- void* libGAP_ReadEvalCommand(libGAP_Obj context)
|
|
+ void* libGAP_ReadEvalCommand(libGAP_Obj context, void *dualSemicolon)
|
|
void* libGAP_ReadEvalFile()
|
|
void* libGAP_ReadEvalResult
|
|
bint libGAP_READ_ERROR()
|
|
diff -up src/sage/libs/gap/test/main.c.orig src/sage/libs/gap/test/main.c
|
|
--- src/sage/libs/gap/test/main.c.orig 2015-07-26 07:34:43.000000000 -0600
|
|
+++ src/sage/libs/gap/test/main.c 2016-04-07 17:51:07.339512407 -0600
|
|
@@ -22,7 +22,7 @@ void eval(char* cmd) {
|
|
libgap_start_interaction(cmd);
|
|
|
|
libgap_enter();
|
|
- libGAP_ReadEvalCommand(libGAP_BottomLVars);
|
|
+ libGAP_ReadEvalCommand(libGAP_BottomLVars, NULL);
|
|
libGAP_ViewObjHandler(libGAP_ReadEvalResult);
|
|
char* out = libgap_get_output();
|
|
libgap_exit();
|