Ticket #9958: trac_9958-build_misc_cythonpy.patch

File trac_9958-build_misc_cythonpy.patch, 2.4 KB (added by fbissey, 10 years ago)

Some minor changes. The biggest change is to the doctest which explicitly refereed to python2.6 also we have extra include folders in a doctest apparently. [updated 20110525]

  • sage/misc/cython.py

    # HG changeset patch
    # User Francois Bissey <francois.bissey@canterbury.ac.nz>
    # Date 1306209063 -43200
    # Node ID 057ac5d4dbeeb6e65bf9b9c52326ef8fe6cf781c
    # Parent  a4e3cf10da309b0e18e56c8d8caaaad7fdd8b053
    #9958 some changes in misc/cython.py - It could be argued that only the doctest changes are necessary.
    
    diff --git a/sage/misc/cython.py b/sage/misc/cython.py
    a b  
    1616
    1717import os, sys
    1818
    19 from misc import SPYX_TMP, SAGE_ROOT
     19from misc import SPYX_TMP, SAGE_ROOT, SAGE_LOCAL
    2020from sage.misc.misc import UNAME
    2121
    2222def cblas():
     
    4343    else:
    4444        return 'atlas'
    4545
    46 include_dirs = ['%s/local/include/csage/'%SAGE_ROOT,
    47                 '%s/local/include/'%SAGE_ROOT,  \
    48                 '%s/local/include/python%s/'%(SAGE_ROOT, sys.version[:3]), \
    49                 '%s/local/lib/python%s/site-packages/numpy/core/include'%(SAGE_ROOT, sys.version[:3]), \
     46include_dirs = ['%s/include/csage/'%SAGE_LOCAL,
     47                '%s/include/'%SAGE_LOCAL,  \
     48                '%s/include/python%s/'%(SAGE_LOCAL, sys.version[:3]), \
     49                '%s/lib/python%s/site-packages/numpy/core/include'%(SAGE_LOCAL, sys.version[:3]), \
    5050                '%s/devel/sage/sage/ext/'%SAGE_ROOT, \
    5151                '%s/devel/sage/'%SAGE_ROOT, \
    5252                '%s/devel/sage/sage/gsl/'%SAGE_ROOT]
     
    156156        'jcntl',
    157157        'rankntl',
    158158        'gsl',
    159         '...blas',
    160         ...,
     159        '...blas'...,
    161160        'ntl',
    162161        'csage'],
    163162        ['.../local/include/csage/',
    164163        '.../local/include/',
    165         '.../local/include/python2.6/',
     164        '.../local/include/python2.7/',
     165        '.../local/lib/python2.7/site-packages/numpy/core/include',
    166166        '.../devel/sage/sage/ext/',
    167167        '.../devel/sage/',
    168168        '.../devel/sage/sage/gsl/'],
     
    179179        'pari',
    180180        'm',
    181181        'curvesntl', 'g0nntl', 'jcntl', 'rankntl',
    182         'gsl', '...blas', ...,
     182        'gsl', '...blas'...,
    183183        'ntl',
    184184        'csage']
    185185        sage: libs[1:] == sage.misc.cython.standard_libs
     
    189189        ['bar',
    190190        '.../local/include/csage/',
    191191        '.../local/include/',
    192         '.../local/include/python2.6/',
     192        '.../local/include/python2.7/',
     193        '.../local/lib/python2.7/site-packages/numpy/core/include',
    193194        '.../devel/sage/sage/ext/',
    194195        '.../devel/sage/',
    195196        '.../devel/sage/sage/gsl/']