Ticket #12173: 07-headers-sage-5.2.patch

File 07-headers-sage-5.2.patch, 12.4 KB (added by jpflori, 10 years ago)

Rebase on 5.2

  • module_list.py

    # HG changeset patch
    # User Jean-Pierre Flori <jean-pierre.flor@ssi.gouv.fr>
    # Date 1338913552 -7200
    # Node ID a567e7437385e23288c51125c3b19f55ff906fe6
    # Parent  a8a53e5ea0c5bfc580ea9ce319dc021aae8f31f6
    #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',
     
    371371    Extension('sage.graphs.matchpoly',
    372372              sources = ['sage/graphs/matchpoly.pyx'],
    373373              libraries = ['gmp', 'flint'],
    374               include_dirs = [SAGE_INC + 'FLINT/'],
     374              include_dirs = [SAGE_INC + 'flint/'],
    375375              extra_compile_args = ['-std=c99'],
    376376              depends = flint_depends),
    377377
     
    472472    Extension('sage.groups.perm_gps.partn_ref.automorphism_group_canonical_label',
    473473              sources = ['sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pyx'],
    474474              libraries = ['gmp', 'flint'],
    475               include_dirs = [SAGE_INC + 'FLINT/'],
     475              include_dirs = [SAGE_INC + 'flint/'],
    476476              extra_compile_args = ['-std=c99'],
    477477              depends = flint_depends),
    478478
    479479    Extension('sage.groups.perm_gps.partn_ref.double_coset',
    480480              sources = ['sage/groups/perm_gps/partn_ref/double_coset.pyx'],
    481481              libraries = ['gmp', 'flint'],
    482               include_dirs = [SAGE_INC + 'FLINT/'],
     482              include_dirs = [SAGE_INC + 'flint/'],
    483483              extra_compile_args = ['-std=c99'],
    484484              depends = flint_depends),
    485485
    486486    Extension('sage.groups.perm_gps.partn_ref.refinement_binary',
    487487              sources = ['sage/groups/perm_gps/partn_ref/refinement_binary.pyx'],
    488488              libraries = ['gmp', 'flint'],
    489               include_dirs = [SAGE_INC + 'FLINT/'],
     489              include_dirs = [SAGE_INC + 'flint/'],
    490490              extra_compile_args = ['-std=c99'],
    491491              depends = flint_depends),
    492492
    493493    Extension('sage.groups.perm_gps.partn_ref.refinement_graphs',
    494494              sources = ['sage/groups/perm_gps/partn_ref/refinement_graphs.pyx'],
    495495              libraries = ['gmp', 'flint'],
    496               include_dirs = [SAGE_INC + 'FLINT/'],
     496              include_dirs = [SAGE_INC + 'flint/'],
    497497              extra_compile_args = ['-std=c99'],
    498498              depends = flint_depends),
    499499
    500500    Extension('sage.groups.perm_gps.partn_ref.refinement_lists',
    501501              sources = ['sage/groups/perm_gps/partn_ref/refinement_lists.pyx'],
    502502              libraries = ['gmp', 'flint'],
    503               include_dirs = [SAGE_INC + 'FLINT/'],
     503              include_dirs = [SAGE_INC + 'flint/'],
    504504              extra_compile_args = ['-std=c99'],
    505505              depends = flint_depends),
    506506
    507507    Extension('sage.groups.perm_gps.partn_ref.refinement_matrices',
    508508              sources = ['sage/groups/perm_gps/partn_ref/refinement_matrices.pyx'],
    509509              libraries = ['gmp', 'flint'],
    510               include_dirs = [SAGE_INC + 'FLINT/'],
     510              include_dirs = [SAGE_INC + 'flint/'],
    511511              extra_compile_args = ['-std=c99'],
    512512              depends = flint_depends),
    513513
    514514    Extension('sage.groups.perm_gps.partn_ref.refinement_python',
    515515              sources = ['sage/groups/perm_gps/partn_ref/refinement_python.pyx'],
    516516              libraries = ['gmp', 'flint'],
    517               include_dirs = [SAGE_INC + 'FLINT/'],
     517              include_dirs = [SAGE_INC + 'flint/'],
    518518              extra_compile_args = ['-std=c99'],
    519519              depends = flint_depends),
    520520
     
    589589    Extension('sage.libs.flint.flint',
    590590              sources = ["sage/libs/flint/flint.pyx"],
    591591              libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"],
    592               include_dirs = [SAGE_INC + 'FLINT/'],
     592              include_dirs = [SAGE_INC + 'flint/'],
    593593              extra_compile_args=["-std=c99", "-D_XPG6"],
    594594              depends = flint_depends),
    595595
    596596    Extension('sage.libs.flint.fmpz_poly',
    597597              sources = ["sage/libs/flint/fmpz_poly.pyx"],
    598598              libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"],
    599               include_dirs = [SAGE_INC + 'FLINT/'],
     599              include_dirs = [SAGE_INC + 'flint/'],
    600600              extra_compile_args=["-std=c99", "-D_XPG6"],
    601601              depends = flint_depends),
    602602   
     
    11451145    Extension('sage.modular.modform.eis_series_cython',
    11461146              sources = ['sage/modular/modform/eis_series_cython.pyx'],
    11471147              libraries = ["gmp", "flint"],
    1148               include_dirs = [SAGE_INC + 'FLINT/'],
     1148              include_dirs = [SAGE_INC + 'flint/'],
    11491149              extra_compile_args = ['-std=c99'],
    11501150              depends = flint_depends),
    11511151
    11521152    Extension('sage.modular.modsym.apply',
    11531153              sources = ['sage/modular/modsym/apply.pyx'],
    11541154              libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"],
    1155               include_dirs = [SAGE_INC + 'FLINT/'],
     1155              include_dirs = [SAGE_INC + 'flint/'],
    11561156              extra_compile_args=["-std=c99",  "-D_XPG6"],
    11571157              depends = flint_depends),
    11581158
     
    11621162    Extension('sage.modular.modsym.heilbronn',
    11631163              sources = ['sage/modular/modsym/heilbronn.pyx'],
    11641164              libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"],
    1165               include_dirs = [SAGE_INC + 'FLINT/'],
     1165              include_dirs = [SAGE_INC + 'flint/'],
    11661166              extra_compile_args=["-std=c99", "-D_XPG6"],
    11671167              depends = flint_depends),
    11681168
     
    13371337    Extension('sage.rings.integer',
    13381338              sources = ['sage/rings/integer.pyx'],
    13391339              libraries=['ntl', 'pari', 'flint', 'gmp'],
    1340               include_dirs = [SAGE_INC + 'FLINT/'],
     1340              include_dirs = [SAGE_INC + 'flint/'],
    13411341              depends = numpy_depends + flint_depends),
    13421342
    13431343    Extension('sage.rings.integer_ring',
     
    13591359              sources = ['sage/rings/fraction_field_FpT.pyx'],
    13601360              libraries = ["csage", "flint", "gmp", "gmpxx", "ntl", "zn_poly"],
    13611361              extra_compile_args=["-std=c99", "-D_XPG6"],
    1362               include_dirs = [SAGE_INC + 'FLINT/'],
     1362              include_dirs = [SAGE_INC + 'flint/'],
    13631363              depends = flint_depends),
    13641364   
    13651365    Extension('sage.rings.laurent_series_ring_element',
     
    16291629              sources = ['sage/rings/polynomial/polynomial_zmod_flint.pyx'],
    16301630              libraries = ["csage", "flint", "gmp", "gmpxx", "ntl", "zn_poly"],
    16311631              extra_compile_args=["-std=c99", "-D_XPG6"],
    1632               include_dirs = [SAGE_INC + 'FLINT/'],
     1632              include_dirs = [SAGE_INC + 'flint/'],
    16331633              depends = flint_depends),
    16341634
    16351635    Extension('sage.rings.polynomial.polynomial_integer_dense_flint',
    16361636              sources = ['sage/rings/polynomial/polynomial_integer_dense_flint.pyx'],
    16371637              language = 'c++',
    16381638              libraries = ["csage", "flint", "ntl", "gmpxx", "gmp"],
    1639               include_dirs = [SAGE_INC + 'FLINT/'],
     1639              include_dirs = [SAGE_INC + 'flint/'],
    16401640              depends = flint_depends),
    16411641
    16421642    Extension('sage.rings.polynomial.polynomial_integer_dense_ntl',
     
    16501650              language = 'c++',
    16511651              extra_compile_args=["-std=c99"] + uname_specific('SunOS', [], ['-D_XPG6']),
    16521652              libraries = ["csage", "flint", "ntl", "gmpxx", "gmp"],
    1653               include_dirs = [SAGE_INC + 'FLINT/', 'sage/libs/flint/'],
     1653              include_dirs = [SAGE_INC + 'flint/', 'sage/libs/flint/'],
    16541654              depends = flint_depends),
    16551655
    16561656    Extension('sage.rings.polynomial.polynomial_modn_dense_ntl',
     
    16931693              depends = [SAGE_INC + 'ratpoints.h',
    16941694                         SAGE_INC + 'gmp.h'] +
    16951695                         flint_depends,
    1696               include_dirs = [SAGE_INC + 'FLINT/'],
     1696              include_dirs = [SAGE_INC + 'flint/'],
    16971697              libraries = ['flint', 'gmp', 'ratpoints']),
    16981698
    16991699    Extension('sage.schemes.hyperelliptic_curves.hypellfrob',
     
    17221722    Extension('sage.sets.disjoint_set',
    17231723              sources = ['sage/sets/disjoint_set.pyx'],
    17241724              libraries = ['gmp', 'flint'],
    1725               include_dirs = [SAGE_INC + 'FLINT/'],
     1725              include_dirs = [SAGE_INC + 'flint/'],
    17261726              extra_compile_args = ['-std=c99'],
    17271727              depends = flint_depends),
    17281728
  • 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):