[sagemath] 01/02: Build with Sage's singular entirely.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch sage-6.5
in repository sagemath.

commit 79822aec6d4f57d82993c861959fa92f3c9d34ea
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Sat Mar 21 09:31:37 2015 +0100

    Build with Sage's singular entirely.
---
 debian/patches/unbreak.patch | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/debian/patches/unbreak.patch b/debian/patches/unbreak.patch
index 87d17fa..d3e7c84 100644
--- a/debian/patches/unbreak.patch
+++ b/debian/patches/unbreak.patch
@@ -158,16 +158,30 @@
  This plots a direction field (the plotdf Maxima package was also
 --- a/sage/src/module_list.py
 +++ b/sage/src/module_list.py
-@@ -4,7 +4,7 @@
+@@ -4,7 +4,8 @@
  from distutils.extension import Extension
  from sage.env import SAGE_LOCAL
  
 -SAGE_INC = os.path.join(SAGE_LOCAL, 'include')
 +SAGE_INC = '/usr/include'
++SAGE_INC_LOCAL = os.path.join(SAGE_LOCAL, 'include')
  
  #########################################################
  ### BLAS setup
-@@ -746,7 +746,7 @@
+@@ -41,10 +42,10 @@
+ numpy_depends = [SAGE_LOCAL + '/lib/python/site-packages/numpy/core/include/numpy/_numpyconfig.h']
+ 
+ flint_depends = [SAGE_INC + '/flint/flint.h']
+-singular_depends = [SAGE_INC + '/libsingular.h']
++singular_depends = [SAGE_INC_LOCAL + '/libsingular.h']
+ givaro_depends = [SAGE_INC + '/givaro/givconfig.h']
+ 
+-singular_incs = [SAGE_INC + '/singular', SAGE_INC + '/factory']
++singular_incs = [SAGE_INC_LOCAL + '/singular', SAGE_INC_LOCAL + '/factory']
+ 
+ #########################################################
+ ### M4RI flags
+@@ -746,7 +747,7 @@
                sources = ['sage/libs/lcalc/lcalc_Lfunction.pyx'],
                libraries = ['m', 'ntl', 'mpfr', 'gmp', 'gmpxx',
                             'Lfunction'],
@@ -419,15 +433,6 @@
                  os.path.join(SAGE_SRC,'sage','ext'), \
                  os.path.join(SAGE_SRC), \
                  os.path.join(SAGE_SRC,'sage','gsl')]
-@@ -337,7 +337,7 @@
- 
-         sage: code = [
-         ... "#clang C++",
--        ... "#cinclude %s/include/singular %s/include/factory"%(SAGE_LOCAL, SAGE_LOCAL),
-+        ... "#cinclude /usr/include/singular /usr/include/factory",
-         ... "#clib m readline singular givaro ntl gmpxx gmp",
-         ... "from sage.rings.polynomial.multi_polynomial_libsingular cimport MPolynomial_libsingular",
-         ... "from sage.libs.singular.polynomial cimport singular_polynomial_pow",
 @@ -435,7 +435,7 @@
      file_list = []
      for fname in additional_source_files:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git