[sagemath] 01/01: Polish Debian patches for libgap-sage support
Jerome Benoit
calculus-guest at moszumanska.debian.org
Mon Aug 8 15:19:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository sagemath.
commit 5a426493bbc23ebd1caf87972a13941f71167a72
Author: Jerome BENOIT <quartermaster at rezozer.net>
Date: Mon Aug 8 16:15:57 2016 +0100
Polish Debian patches for libgap-sage support
---
debian/patches/debian-arb.patch | 4 +-
debian/patches/debian-libgap-sage.patch | 64 +++++++++++++++++++++++++-
debian/patches/fixsage-libgap-systemwide.patch | 40 ++++++++--------
3 files changed, 85 insertions(+), 23 deletions(-)
diff --git a/debian/patches/debian-arb.patch b/debian/patches/debian-arb.patch
index 1bc35c6..7c7e746 100644
--- a/debian/patches/debian-arb.patch
+++ b/debian/patches/debian-arb.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
--- a/sage/src/module_list.py
+++ b/sage/src/module_list.py
-@@ -127,7 +127,7 @@
+@@ -133,7 +133,7 @@
"singular", "ec", "ecm",
] + linbox_libs + gsl_libs + [
"pari", "flint", "ratpoints", "ecl", "glpk", "ppl",
@@ -15,7 +15,7 @@ Forwarded: not-needed
"polybori",
"polybori_groebner",
"m4rie",
-@@ -884,7 +884,7 @@
+@@ -898,7 +898,7 @@
Extension("sage.matrix.matrix_complex_ball_dense",
["sage/matrix/matrix_complex_ball_dense.pyx"],
diff --git a/debian/patches/debian-libgap-sage.patch b/debian/patches/debian-libgap-sage.patch
index ac091e6..b73aa07 100644
--- a/debian/patches/debian-libgap-sage.patch
+++ b/debian/patches/debian-libgap-sage.patch
@@ -21,7 +21,69 @@
main.o: main.c
echo $(GAPDIR)
- gcc -std=gnu99 -DGAPDIR="\"$(GAPDIR)\"" -I$(SAGE_LOCAL)/include -I$(SAGE_LOCAL)/include/python2.6 -c -g $^
-+ gcc -std=gnu99 -DGAPDIR="\"$(GAPDIR)\"" $(LIBGAP_CFLAGS) -I$(SAGE_LOCAL)/include -I$(SAGE_LOCAL)/include/python2.6 -c -g $^
++ gcc -std=gnu99 -DGAPDIR="\"$(GAPDIR)\"" $(LIBGAP_CFLAGS) -I$(SAGE_LOCAL)/include -I$(SAGE_LOCAL)/include/python2.7 -c -g $^
clean:
rm main.o main *~
+--- a/sage/src/module_list.py
++++ b/sage/src/module_list.py
+@@ -46,6 +46,12 @@
+ gsl_library_dirs = list(gsl_pc['library_dirs'])
+ gsl_include_dirs = list(gsl_pc['include_dirs'])
+
++# LibGAP
++libgap_pc = pkgconfig.parse('libgap-sage')
++libgap_libs = list(libgap_pc['libraries'])
++libgap_library_dirs = list(libgap_pc['library_dirs'])
++libgap_include_dirs = list(libgap_pc['include_dirs'])
++
+ # GD image library
+ gd_pc = pkgconfig.parse('gdlib')
+ gd_libs = list(gd_pc['libraries'])
+@@ -133,8 +139,8 @@
+ "polybori_groebner",
+ "m4rie",
+ ] + m4ri_libs + [
+- "zn_poly", "gap",
+-] + gd_libs + png_libs + [
++ "zn_poly",
++] + libgap_libs + gd_libs + png_libs + [
+ "m", "readline", "Lfunction" ,
+ ] + cblas_libs + [
+ "cryptominisat",
+@@ -236,7 +242,9 @@
+
+ Extension('sage.coding.codecan.codecan',
+ sources = ['sage/coding/codecan/codecan.pyx'],
+- libraries = ['flint']),
++ libraries = ['flint'],
++ library_dirs = libgap_library_dirs,
++ include_dirs = libgap_include_dirs),
+
+ Extension('*', ['sage/coding/**/*.pyx']),
+
+@@ -732,15 +740,21 @@
+
+ Extension('sage.libs.gap.util',
+ sources = ["sage/libs/gap/util.pyx"],
+- libraries = ['gmp', 'gap', 'm']),
++ libraries = ['gmp'] + libgap_libs + ['m'],
++ library_dirs = libgap_library_dirs,
++ include_dirs = libgap_include_dirs),
+
+ Extension('sage.libs.gap.element',
+ sources = ["sage/libs/gap/element.pyx"],
+- libraries = ['gmp', 'gap', 'm']),
++ libraries = ['gmp'] + libgap_libs + ['m'],
++ library_dirs = libgap_library_dirs,
++ include_dirs = libgap_include_dirs),
+
+ Extension('sage.libs.gap.libgap',
+ sources = ["sage/libs/gap/libgap.pyx"],
+- libraries = ['gmp', 'gap', 'm']),
++ libraries = ['gmp'] + libgap_libs + ['m'],
++ library_dirs = libgap_library_dirs,
++ include_dirs = libgap_include_dirs),
+
+ ###################################
+ ##
diff --git a/debian/patches/fixsage-libgap-systemwide.patch b/debian/patches/fixsage-libgap-systemwide.patch
index 3cbb983..82f47d0 100644
--- a/debian/patches/fixsage-libgap-systemwide.patch
+++ b/debian/patches/fixsage-libgap-systemwide.patch
@@ -5,13 +5,13 @@
-cdef extern from "gap/system.h":
-+cdef extern from <gap/system.h>:
++cdef extern from "<gap/system.h>":
ctypedef char libGAP_Char
ctypedef int libGAP_Int
ctypedef unsigned char libGAP_UChar
-cdef extern from "gap/libgap.h":
-+cdef extern from <gap/libgap.h>:
++cdef extern from "<gap/libgap.h>":
void libgap_initialize(int argc, char** argv)
ctypedef void(*libgap_gasman_callback_ptr)()
void libgap_set_gasman_callback(libgap_gasman_callback_ptr callback)
@@ -20,12 +20,12 @@
void libgap_exit()
-cdef extern from "gap/code.h":
-+cdef extern from <gap/code.h>:
++cdef extern from "<gap/code.h>":
ctypedef unsigned int libGAP_Stat
ctypedef libGAP_Stat* libGAP_PtrBody
-cdef extern from "gap/gap.h":
-+cdef extern from <gap/gap.h>:
++cdef extern from "<gap/gap.h>":
ctypedef unsigned int libGAP_UInt
ctypedef void* libGAP_ExecStatus
void libGAP_ViewObjHandler(void*)
@@ -34,7 +34,7 @@
cdef libGAP_ExecStatus libGAP_STATUS_QQUIT
-cdef extern from "gap/objects.h":
-+cdef extern from <gap/objects.h>:
++cdef extern from "<gap/objects.h>":
ctypedef void* libGAP_Obj
libGAP_Obj libGAP_SHALLOW_COPY_OBJ(libGAP_Obj obj)
bint libGAP_IS_INTOBJ(libGAP_Obj obj)
@@ -43,14 +43,14 @@
cdef int libGAP_LAST_TESTING_TNUM
-cdef extern from "gap/read.h":
-+cdef extern from <gap/read.h>:
++cdef extern from "<gap/read.h>":
void* libGAP_ReadEvalCommand(libGAP_Obj context, libGAP_UInt *dualSemicolon)
void* libGAP_ReadEvalFile()
void* libGAP_ReadEvalResult
bint libGAP_READ_ERROR()
-cdef extern from "gap/scanner.h":
-+cdef extern from <gap/scanner.h>:
++cdef extern from "<gap/scanner.h>":
void libGAP_ClearError()
libGAP_UInt libGAP_NrError
libGAP_UInt libGAP_Symbol
@@ -59,13 +59,13 @@
int libGAP_S_EOF
-cdef extern from "gap/gvars.h":
-+cdef extern from <gap/gvars.h>:
++cdef extern from "<gap/gvars.h>":
libGAP_UInt libGAP_GVarName(char* name)
void libGAP_AssGVar(libGAP_UInt gvar, libGAP_Obj val)
libGAP_Obj libGAP_VAL_GVAR(libGAP_UInt gvar)
-cdef extern from "gap/string.h":
-+cdef extern from <gap/string.h>:
++cdef extern from "<gap/string.h>":
char* libGAP_CSTR_STRING(libGAP_Obj list)
int libGAP_GET_LEN_STRING(libGAP_Obj list)
bint libGAP_IS_STRING(libGAP_Obj obj)
@@ -74,7 +74,7 @@
void libGAP_C_NEW_STRING(libGAP_Obj new_gap_string, int length, char* c_string)
-cdef extern from "gap/gasman.h":
-+cdef extern from <gap/gasman.h>:
++cdef extern from "<gap/gasman.h>":
void libGAP_InitGlobalBag(libGAP_Obj* addr, char* cookie)
libGAP_Obj libGAP_NewBag(libGAP_UInt type, libGAP_UInt size)
void libGAP_CHANGED_BAG(libGAP_Obj bag)
@@ -83,7 +83,7 @@
cdef extern libGAP_Obj* libGAP_EndBags
-cdef extern from "gap/ariths.h":
-+cdef extern from <gap/ariths.h>:
++cdef extern from "<gap/ariths.h>":
libGAP_Obj libGAP_SUM (libGAP_Obj, libGAP_Obj)
libGAP_Obj libGAP_DIFF(libGAP_Obj, libGAP_Obj)
libGAP_Obj libGAP_PROD(libGAP_Obj, libGAP_Obj)
@@ -92,27 +92,27 @@
bint libGAP_LT(libGAP_Obj opL, libGAP_Obj opR)
-cdef extern from "gap/calls.h":
-+cdef extern from <gap/calls.h>:
++cdef extern from "<gap/calls.h>":
bint libGAP_IS_FUNC(libGAP_Obj)
-cdef extern from "gap/plist.h":
-+cdef extern from <gap/plist.h>:
++cdef extern from "<gap/plist.h>":
libGAP_Obj libGAP_NEW_PLIST(int type, int len)
bint libGAP_IS_PLIST(libGAP_Obj lst)
int libGAP_LEN_PLIST(libGAP_Obj lst)
libGAP_Obj libGAP_ELM_PLIST(libGAP_Obj lst, int pos)
-cdef extern from "gap/lists.h":
-+cdef extern from <gap/lists.h>:
++cdef extern from "<gap/lists.h>":
void libGAP_UNB_LIST(libGAP_Obj list, int pos)
-cdef extern from "gap/listfunc.h":
-+cdef extern from <gap/listfunc.h>:
++cdef extern from "<gap/listfunc.h>":
void libGAP_AddList(libGAP_Obj list, libGAP_Obj obj)
void libGAP_AddPlist(libGAP_Obj list, libGAP_Obj obj)
-cdef extern from "gap/records.h":
-+cdef extern from <gap/records.h>:
++cdef extern from "<gap/records.h>":
char* libGAP_NAME_RNAM(libGAP_UInt rnam)
libGAP_UInt libGAP_RNamIntg(int i)
bint libGAP_IS_REC(libGAP_Obj obj)
@@ -120,7 +120,7 @@
libGAP_UInt libGAP_RNamName(libGAP_Char* name)
-cdef extern from "gap/precord.h":
-+cdef extern from <gap/precord.h>:
++cdef extern from "<gap/precord.h>":
libGAP_Obj libGAP_NEW_PREC(int len)
int libGAP_LEN_PREC(libGAP_Obj rec)
int libGAP_GET_RNAM_PREC(libGAP_Obj rec, int i)
@@ -129,16 +129,16 @@
libGAP_Obj libGAP_ElmPRec(libGAP_Obj rec, libGAP_UInt rnam)
-cdef extern from "gap/cyclotom.h":
-+cdef extern from <gap/cyclotom.h>:
++cdef extern from "<gap/cyclotom.h>":
pass
-cdef extern from "gap/bool.h":
-+cdef extern from <gap/bool.h>:
++cdef extern from "<gap/bool.h>":
cdef libGAP_Obj libGAP_True
cdef libGAP_Obj libGAP_False
-cdef extern from "gap/vars.h":
-+cdef extern from <gap/vars.h>:
++cdef extern from "<gap/vars.h>":
cdef int libGAP_T_LVARS
libGAP_Obj libGAP_BottomLVars
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git
More information about the debian-science-commits
mailing list