[sagemath] 01/01: Add sage/ext to cython include path also when sage is installed.

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository sagemath.

commit 4c318a62bb9052a363d4a913733ead321d6e6fe9
Author: Tobias Hansen <thansen at broeselmaschine.fc.up.pt>
Date:   Sat Dec 3 21:02:15 2016 +0000

    Add sage/ext to cython include path also when sage is installed.
---
 debian/patches/temp-cython-include-source.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/temp-cython-include-source.patch b/debian/patches/temp-cython-include-source.patch
index d7e488a..cb96d6e 100644
--- a/debian/patches/temp-cython-include-source.patch
+++ b/debian/patches/temp-cython-include-source.patch
@@ -1,5 +1,5 @@
-Description: Include the Cython headers from the source directory
- So they are found when running the tests without installing Sage.
+Description: Include the Cython headers from the source directory...
+ ...if the tests are run from a non-installed sage.
 Author: Tobias Hansen <thansen at debian.org>
 
 --- a/sage/src/sage/misc/cython.py
@@ -9,7 +9,7 @@ Author: Tobias Hansen <thansen at debian.org>
  
      v, s = parse_keywords('cinclude', s)
 -    inc = [environ_parse(x.replace('"','').replace("'","")) for x in v] + sage_include_directories()
-+    inc = [environ_parse(x.replace('"','').replace("'","")) for x in v] + sage_include_directories(use_sources=True)
++    inc = [environ_parse(x.replace('"','').replace("'","")) for x in v] + sage_include_directories(use_sources=(SAGE_LOCAL != "/usr"))
      s = """\ninclude "cdefs.pxi"\n""" + s
      s = """\ninclude "cysignals/signals.pxi"  # ctrl-c interrupt block support\ninclude "stdsage.pxi"\n""" + s
      args, s = parse_keywords('cargs', s)

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