Ticket #12173: headers-5.1.rc0.patch

File headers-5.1.rc0.patch, 12.4 KB (added by jpflori, 10 years ago)

Updated patch for 5.1.rc0.

  • module_list.py 

    # HG changeset patch
# User Jean-Pierre Flori <jean-pierre.flor@ssi.gouv.fr>
# Date 1338913552 -7200
# Node ID 27bac2c9cacfd406c6db7a9006465bce6acba3b4
# Parent  ae931d3897bf6b247b32884b951ed5f7611a8099
#12173: Replace FLINT by flint for headers' inclusion

diff --git a/module_list.py b/module_list.py
    a b  
    5353# timestamp of the numpy build.
    5454numpy_depends = [SAGE_LOCAL + '/lib/python/site-packages/numpy/core/include/numpy/_numpyconfig.h']
    5555
    56 flint_depends = [SAGE_INC + 'FLINT/flint.h']
     56flint_depends = [SAGE_INC + 'flint/flint.h']
    5757singular_depends = [SAGE_INC + 'libsingular.h', SAGE_INC + 'givaro/givconfig.h']
    5858ginac_depends = [SAGE_INC + 'pynac/ginac.h']
    5959
    … …  
    111111               sources = ['sage/algebras/quatalg/quaternion_algebra_element.pyx'],
    112112               language='c++',
    113113               libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++", "ntl"],
    114                include_dirs = [SAGE_INC + 'FLINT/'],
     114               include_dirs = [SAGE_INC + 'flint/'],
    115115               depends = flint_depends),
    116116
    117117    Extension('sage.algebras.quatalg.quaternion_algebra_cython',
    … …  
    365365    Extension('sage.graphs.matchpoly',
    366366              sources = ['sage/graphs/matchpoly.pyx'],
    367367              libraries = ['gmp', 'flint'],
    368               include_dirs = [SAGE_INC + 'FLINT/'],
     368              include_dirs = [SAGE_INC + 'flint/'],
    369369              extra_compile_args = ['-std=c99'],
    370370              depends = flint_depends),
    371371
    … …  
    466466    Extension('sage.groups.perm_gps.partn_ref.automorphism_group_canonical_label',
    467467              sources = ['sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pyx'],
    468468              libraries = ['gmp', 'flint'],
    469               include_dirs = [SAGE_INC + 'FLINT/'],
     469              include_dirs = [SAGE_INC + 'flint/'],
    470470              extra_compile_args = ['-std=c99'],
    471471              depends = flint_depends),
    472472
    473473    Extension('sage.groups.perm_gps.partn_ref.double_coset',
    474474              sources = ['sage/groups/perm_gps/partn_ref/double_coset.pyx'],
    475475              libraries = ['gmp', 'flint'],
    476               include_dirs = [SAGE_INC + 'FLINT/'],
     476              include_dirs = [SAGE_INC + 'flint/'],
    477477              extra_compile_args = ['-std=c99'],
    478478              depends = flint_depends),
    479479
    480480    Extension('sage.groups.perm_gps.partn_ref.refinement_binary',
    481481              sources = ['sage/groups/perm_gps/partn_ref/refinement_binary.pyx'],
    482482              libraries = ['gmp', 'flint'],
    483               include_dirs = [SAGE_INC + 'FLINT/'],
     483              include_dirs = [SAGE_INC + 'flint/'],
    484484              extra_compile_args = ['-std=c99'],
    485485              depends = flint_depends),
    486486
    487487    Extension('sage.groups.perm_gps.partn_ref.refinement_graphs',
    488488              sources = ['sage/groups/perm_gps/partn_ref/refinement_graphs.pyx'],
    489489              libraries = ['gmp', 'flint'],
    490               include_dirs = [SAGE_INC + 'FLINT/'],
     490              include_dirs = [SAGE_INC + 'flint/'],
    491491              extra_compile_args = ['-std=c99'],
    492492              depends = flint_depends),
    493493
    494494    Extension('sage.groups.perm_gps.partn_ref.refinement_lists',
    495495              sources = ['sage/groups/perm_gps/partn_ref/refinement_lists.pyx'],
    496496              libraries = ['gmp', 'flint'],
    497               include_dirs = [SAGE_INC + 'FLINT/'],
     497              include_dirs = [SAGE_INC + 'flint/'],
    498498              extra_compile_args = ['-std=c99'],
    499499              depends = flint_depends),
    500500
    501501    Extension('sage.groups.perm_gps.partn_ref.refinement_matrices',
    502502              sources = ['sage/groups/perm_gps/partn_ref/refinement_matrices.pyx'],
    503503              libraries = ['gmp', 'flint'],
    504               include_dirs = [SAGE_INC + 'FLINT/'],
     504              include_dirs = [SAGE_INC + 'flint/'],
    505505              extra_compile_args = ['-std=c99'],
    506506              depends = flint_depends),
    507507
    508508    Extension('sage.groups.perm_gps.partn_ref.refinement_python',
    509509              sources = ['sage/groups/perm_gps/partn_ref/refinement_python.pyx'],
    510510              libraries = ['gmp', 'flint'],
    511               include_dirs = [SAGE_INC + 'FLINT/'],
     511              include_dirs = [SAGE_INC + 'flint/'],
    512512              extra_compile_args = ['-std=c99'],
    513513              depends = flint_depends),
    514514
    … …  
    583583    Extension('sage.libs.flint.flint',
    584584              sources = ["sage/libs/flint/flint.pyx"],
    585585              libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"],
    586               include_dirs = [SAGE_INC + 'FLINT/'],
     586              include_dirs = [SAGE_INC + 'flint/'],
    587587              extra_compile_args=["-std=c99", "-D_XPG6"],
    588588              depends = flint_depends),
    589589
    590590    Extension('sage.libs.flint.fmpz_poly',
    591591              sources = ["sage/libs/flint/fmpz_poly.pyx"],
    592592              libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"],
    593               include_dirs = [SAGE_INC + 'FLINT/'],
     593              include_dirs = [SAGE_INC + 'flint/'],
    594594              extra_compile_args=["-std=c99", "-D_XPG6"],
    595595              depends = flint_depends),
    596596   
    … …  
    11391139    Extension('sage.modular.modform.eis_series_cython',
    11401140              sources = ['sage/modular/modform/eis_series_cython.pyx'],
    11411141              libraries = ["gmp", "flint"],
    1142               include_dirs = [SAGE_INC + 'FLINT/'],
     1142              include_dirs = [SAGE_INC + 'flint/'],
    11431143              extra_compile_args = ['-std=c99'],
    11441144              depends = flint_depends),
    11451145
    11461146    Extension('sage.modular.modsym.apply',
    11471147              sources = ['sage/modular/modsym/apply.pyx'],
    11481148              libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"],
    1149               include_dirs = [SAGE_INC + 'FLINT/'],
     1149              include_dirs = [SAGE_INC + 'flint/'],
    11501150              extra_compile_args=["-std=c99",  "-D_XPG6"],
    11511151              depends = flint_depends),
    11521152
    … …  
    11561156    Extension('sage.modular.modsym.heilbronn',
    11571157              sources = ['sage/modular/modsym/heilbronn.pyx'],
    11581158              libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"],
    1159               include_dirs = [SAGE_INC + 'FLINT/'],
     1159              include_dirs = [SAGE_INC + 'flint/'],
    11601160              extra_compile_args=["-std=c99", "-D_XPG6"],
    11611161              depends = flint_depends),
    11621162
    … …  
    13311331    Extension('sage.rings.integer',
    13321332              sources = ['sage/rings/integer.pyx'],
    13331333              libraries=['ntl', 'pari', 'flint', 'gmp'],
    1334               include_dirs = [SAGE_INC + 'FLINT/'],
     1334              include_dirs = [SAGE_INC + 'flint/'],
    13351335              depends = numpy_depends + flint_depends),
    13361336
    13371337    Extension('sage.rings.integer_ring',
    … …  
    13531353              sources = ['sage/rings/fraction_field_FpT.pyx'],
    13541354              libraries = ["csage", "flint", "gmp", "gmpxx", "ntl", "zn_poly"],
    13551355              extra_compile_args=["-std=c99", "-D_XPG6"],
    1356               include_dirs = [SAGE_INC + 'FLINT/'],
     1356              include_dirs = [SAGE_INC + 'flint/'],
    13571357              depends = flint_depends),
    13581358   
    13591359    Extension('sage.rings.laurent_series_ring_element',
    … …  
    16231623              sources = ['sage/rings/polynomial/polynomial_zmod_flint.pyx'],
    16241624              libraries = ["csage", "flint", "gmp", "gmpxx", "ntl", "zn_poly"],
    16251625              extra_compile_args=["-std=c99", "-D_XPG6"],
    1626               include_dirs = [SAGE_INC + 'FLINT/'],
     1626              include_dirs = [SAGE_INC + 'flint/'],
    16271627              depends = flint_depends),
    16281628
    16291629    Extension('sage.rings.polynomial.polynomial_integer_dense_flint',
    16301630              sources = ['sage/rings/polynomial/polynomial_integer_dense_flint.pyx'],
    16311631              language = 'c++',
    16321632              libraries = ["csage", "flint", "ntl", "gmpxx", "gmp"],
    1633               include_dirs = [SAGE_INC + 'FLINT/'],
     1633              include_dirs = [SAGE_INC + 'flint/'],
    16341634              depends = flint_depends),
    16351635
    16361636    Extension('sage.rings.polynomial.polynomial_integer_dense_ntl',
    … …  
    16441644              language = 'c++',
    16451645              extra_compile_args=["-std=c99"] + uname_specific('SunOS', [], ['-D_XPG6']),
    16461646              libraries = ["csage", "flint", "ntl", "gmpxx", "gmp"],
    1647               include_dirs = [SAGE_INC + 'FLINT/', 'sage/libs/flint/'],
     1647              include_dirs = [SAGE_INC + 'flint/', 'sage/libs/flint/'],
    16481648              depends = flint_depends),
    16491649
    16501650    Extension('sage.rings.polynomial.polynomial_modn_dense_ntl',
    … …  
    16871687              depends = [SAGE_INC + 'ratpoints.h',
    16881688                         SAGE_INC + 'gmp.h'] +
    16891689                         flint_depends,
    1690               include_dirs = [SAGE_INC + 'FLINT/'],
     1690              include_dirs = [SAGE_INC + 'flint/'],
    16911691              libraries = ['flint', 'gmp', 'ratpoints']),
    16921692
    16931693    Extension('sage.schemes.hyperelliptic_curves.hypellfrob',
    … …  
    17161716    Extension('sage.sets.disjoint_set',
    17171717              sources = ['sage/sets/disjoint_set.pyx'],
    17181718              libraries = ['gmp', 'flint'],
    1719               include_dirs = [SAGE_INC + 'FLINT/'],
     1719              include_dirs = [SAGE_INC + 'flint/'],
    17201720              extra_compile_args = ['-std=c99'],
    17211721              depends = flint_depends),
    17221722

  • sage/groups/perm_gps/partn_ref/data_structures_pxd.pxi 

    diff --git a/sage/groups/perm_gps/partn_ref/data_structures_pxd.pxi b/sage/groups/perm_gps/partn_ref/data_structures_pxd.pxi
    a b  
    1313cdef extern from "stdlib.h":
    1414    int rand()
    1515
    16 cdef extern from "FLINT/ulong_extras.h":
     16cdef extern from "flint/ulong_extras.h":
    1717    int n_is_prime(unsigned long n)
    1818
    1919cdef struct OrbitPartition:

  • sage/libs/flint/flint.pxd 

    diff --git a/sage/libs/flint/flint.pxd b/sage/libs/flint/flint.pxd
    a b  
    1 cdef extern from "FLINT/flint.h":
     1cdef extern from "flint/flint.h":
    22
    33    cdef long FLINT_BITS
    44    cdef long FLINT_D_BITS

  • sage/libs/flint/fmpz.pxi 

    diff --git a/sage/libs/flint/fmpz.pxi b/sage/libs/flint/fmpz.pxi
    a b  
    11include "../ntl/decl.pxi"
    22
    3 cdef extern from "FLINT/fmpz.h":
     3cdef extern from "flint/fmpz.h":
    44
    55    ctypedef long fmpz   
    66    ctypedef long * fmpz_t

  • sage/libs/flint/fmpz_poly.pxd 

    diff --git a/sage/libs/flint/fmpz_poly.pxd b/sage/libs/flint/fmpz_poly.pxd
    a b  
    99cdef class Fmpz_poly(SageObject):
    1010    cdef fmpz_poly_t poly
    1111
    12 cdef extern from "FLINT/fmpz_poly.h":
     12cdef extern from "flint/fmpz_poly.h":
    1313    cdef void fmpz_poly_reverse(fmpz_poly_t output, fmpz_poly_t input,
    1414            unsigned long length)

  • sage/libs/flint/fmpz_poly.pxi 

    diff --git a/sage/libs/flint/fmpz_poly.pxi b/sage/libs/flint/fmpz_poly.pxi
    a b  
    11include "fmpz.pxi"
    22include "../ntl/decl.pxi"
    33
    4 cdef extern from "FLINT/fmpz_poly.h":
     4cdef extern from "flint/fmpz_poly.h":
    55   
    66    ctypedef void* fmpz_poly_t
    77   

  • sage/libs/flint/ntl_interface.pxd 

    diff --git a/sage/libs/flint/ntl_interface.pxd b/sage/libs/flint/ntl_interface.pxd
    a b  
    55from sage.libs.ntl.ntl_ZZ_decl cimport ZZ_c
    66from sage.libs.ntl.ntl_ZZX_decl cimport ZZX_c
    77
    8 cdef extern from "FLINT/NTL-interface.h":
     8cdef extern from "flint/NTL-interface.h":
    99
    1010    void fmpz_poly_get_ZZX(ZZX_c output, fmpz_poly_t poly)
    1111    void fmpz_poly_set_ZZX(fmpz_poly_t output, ZZX_c poly)

  • sage/libs/flint/ulong_extras.pxd 

    diff --git a/sage/libs/flint/ulong_extras.pxd b/sage/libs/flint/ulong_extras.pxd
    a b  
    44from sage.libs.flint.flint cimport *
    55
    66
    7 cdef extern from "FLINT/ulong_extras.h":
     7cdef extern from "flint/ulong_extras.h":
    88
    99    ctypedef struct n_factor_t:
    1010        int num

  • sage/libs/flint/zmod_poly.pxd 

    diff --git a/sage/libs/flint/zmod_poly.pxd b/sage/libs/flint/zmod_poly.pxd
    a b  
    55
    66from flint import *
    77
    8 cdef extern from "FLINT/nmod_poly.h":
     8cdef extern from "flint/nmod_poly.h":
    99
    1010    ctypedef unsigned long mp_bitcnt_t
    1111    ctypedef void * mp_srcptr

  • sage/rings/polynomial/polynomial_integer_dense_flint.pyx 

    diff --git a/sage/rings/polynomial/polynomial_integer_dense_flint.pyx b/sage/rings/polynomial/polynomial_integer_dense_flint.pyx
    a b  
    4848cdef extern from "limits.h":
    4949    long LONG_MAX
    5050
    51 cdef extern from "FLINT/flint.h":
     51cdef extern from "flint/flint.h":
    5252    int FLINT_BITS
    5353
    5454cdef class Polynomial_integer_dense_flint(Polynomial):