[sagemath] 01/01: Fix libGAP patch
Ximin Luo
infinity0 at debian.org
Mon Aug 8 16:56:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository sagemath.
commit a8a854a83afe922a119b854934ef3ab2395331e3
Author: Ximin Luo <infinity0 at debian.org>
Date: Mon Aug 8 18:55:42 2016 +0200
Fix libGAP patch
Many Sage modules use libGAP, it's easier to add these paths to all modules
rather than figure out exactly which ones we should patch.
---
debian/patches/debian-arb.patch | 4 +-
debian/patches/debian-cython-sys-path.patch | 2 +-
debian/patches/debian-libgap-sage.patch | 64 ++++++++++++++++++-----------
debian/patches/debian-temp-userdir.patch | 4 +-
4 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/debian/patches/debian-arb.patch b/debian/patches/debian-arb.patch
index 7c7e746..280ccad 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
-@@ -133,7 +133,7 @@
+@@ -131,7 +131,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",
-@@ -898,7 +898,7 @@
+@@ -888,7 +888,7 @@
Extension("sage.matrix.matrix_complex_ball_dense",
["sage/matrix/matrix_complex_ball_dense.pyx"],
diff --git a/debian/patches/debian-cython-sys-path.patch b/debian/patches/debian-cython-sys-path.patch
index bdf1c79..6daf4ef 100644
--- a/debian/patches/debian-cython-sys-path.patch
+++ b/debian/patches/debian-cython-sys-path.patch
@@ -5,7 +5,7 @@ Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/s
--- a/sage/src/setup.py
+++ b/sage/src/setup.py
-@@ -585,6 +585,7 @@
+@@ -591,6 +591,7 @@
build_dir=SAGE_CYTHONIZED,
force=force,
aliases=aliases,
diff --git a/debian/patches/debian-libgap-sage.patch b/debian/patches/debian-libgap-sage.patch
index b73aa07..2acf720 100644
--- a/debian/patches/debian-libgap-sage.patch
+++ b/debian/patches/debian-libgap-sage.patch
@@ -1,3 +1,10 @@
+Description: Use Debian libGAP paths
+ Debian installs libGAP headers to non-standard paths to avoid conflict with
+ the main GAP headers. Moreover, many Sage modules use libGAP, so just add
+ these paths to all modules instead of doing module-specific patches.
+Author: Jerome BENOIT <calculus at rezozer.net>
+Author: Ximin Luo <infinity0 at debian.org>
+Forwarded: not-needed
--- a/sage/src/sage/libs/gap/test/Makefile
+++ b/sage/src/sage/libs/gap/test/Makefile
@@ -1,6 +1,8 @@
@@ -27,20 +34,18 @@
rm main.o main *~
--- a/sage/src/module_list.py
+++ b/sage/src/module_list.py
-@@ -46,6 +46,12 @@
+@@ -46,6 +46,10 @@
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 @@
+@@ -133,8 +137,8 @@
"polybori_groebner",
"m4rie",
] + m4ri_libs + [
@@ -51,39 +56,48 @@
"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 @@
+@@ -732,15 +736,15 @@
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),
++ libraries = ['gmp'] + libgap_libs + ['m']),
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),
++ libraries = ['gmp'] + libgap_libs + ['m']),
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),
++ libraries = ['gmp'] + libgap_libs + ['m']),
###################################
##
+--- a/sage/src/setup.py
++++ b/sage/src/setup.py
+@@ -161,6 +161,12 @@
+ "ntl": [ os.path.join('/usr/include', 'NTL', 'config.h') ]
+ }
+
++import pkgconfig
++# LibGAP
++libgap_pc = pkgconfig.parse('libgap-sage')
++libgap_library_dirs = list(libgap_pc['library_dirs'])
++libgap_include_dirs = list(libgap_pc['include_dirs'])
++
+ # In the loop below, don't append to any list, since many of these
+ # lists are actually identical Python objects. For every list, we need
+ # to write (at least the first time):
+@@ -178,8 +184,8 @@
+
+ m.extra_compile_args = m.extra_compile_args + extra_compile_args
+ m.extra_link_args = m.extra_link_args + extra_link_args
+- m.library_dirs = m.library_dirs + [os.path.join(SAGE_LOCAL, "lib"), '/usr/lib']
+- m.include_dirs = m.include_dirs + include_dirs
++ m.library_dirs = m.library_dirs + libgap_library_dirs + [os.path.join(SAGE_LOCAL, "lib"), '/usr/lib']
++ m.include_dirs = m.include_dirs + libgap_include_dirs + include_dirs
+
+
+ #############################################
diff --git a/debian/patches/debian-temp-userdir.patch b/debian/patches/debian-temp-userdir.patch
index eb0c76b..05fba6f 100644
--- a/debian/patches/debian-temp-userdir.patch
+++ b/debian/patches/debian-temp-userdir.patch
@@ -71,7 +71,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
#########################################################
### Configuration
-@@ -590,6 +591,11 @@
+@@ -596,6 +597,11 @@
'embedsignature': True,
'profile': profile,
})
@@ -83,7 +83,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
open(version_file, 'w').write(version_stamp)
-@@ -610,7 +616,7 @@
+@@ -616,7 +622,7 @@
python_packages, python_modules = find_python_sources(
SAGE_SRC, ['sage', 'sage_setup'])
python_data_files = find_extra_files(python_packages,
--
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