Ticket #12173: headers.patch

File headers.patch, 12.3 KB (added by jpflori, 10 years ago)

Replace FLINT by flint for headers inclusion.

  • module_list.py

    # HG changeset patch
    # User Jean-Pierre Flori <jean-pierre.flor@ssi.gouv.fr>
    # Date 1338913552 -7200
    # Node ID f71aae6d4f4a07edbdbd324e3b37fc3e7a495fe0
    # Parent  b90d0eecd676fe70990fb0cd6253a7020be2a1a7
    #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']
    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',
     
    359359    Extension('sage.graphs.matchpoly',
    360360              sources = ['sage/graphs/matchpoly.pyx'],
    361361              libraries = ['gmp', 'flint'],
    362               include_dirs = [SAGE_INC + 'FLINT/'],
     362              include_dirs = [SAGE_INC + 'flint/'],
    363363              extra_compile_args = ['-std=c99'],
    364364              depends = flint_depends),
    365365
     
    460460    Extension('sage.groups.perm_gps.partn_ref.automorphism_group_canonical_label',
    461461              sources = ['sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pyx'],
    462462              libraries = ['gmp', 'flint'],
    463               include_dirs = [SAGE_INC + 'FLINT/'],
     463              include_dirs = [SAGE_INC + 'flint/'],
    464464              extra_compile_args = ['-std=c99'],
    465465              depends = flint_depends),
    466466
    467467    Extension('sage.groups.perm_gps.partn_ref.double_coset',
    468468              sources = ['sage/groups/perm_gps/partn_ref/double_coset.pyx'],
    469469              libraries = ['gmp', 'flint'],
    470               include_dirs = [SAGE_INC + 'FLINT/'],
     470              include_dirs = [SAGE_INC + 'flint/'],
    471471              extra_compile_args = ['-std=c99'],
    472472              depends = flint_depends),
    473473
    474474    Extension('sage.groups.perm_gps.partn_ref.refinement_binary',
    475475              sources = ['sage/groups/perm_gps/partn_ref/refinement_binary.pyx'],
    476476              libraries = ['gmp', 'flint'],
    477               include_dirs = [SAGE_INC + 'FLINT/'],
     477              include_dirs = [SAGE_INC + 'flint/'],
    478478              extra_compile_args = ['-std=c99'],
    479479              depends = flint_depends),
    480480
    481481    Extension('sage.groups.perm_gps.partn_ref.refinement_graphs',
    482482              sources = ['sage/groups/perm_gps/partn_ref/refinement_graphs.pyx'],
    483483              libraries = ['gmp', 'flint'],
    484               include_dirs = [SAGE_INC + 'FLINT/'],
     484              include_dirs = [SAGE_INC + 'flint/'],
    485485              extra_compile_args = ['-std=c99'],
    486486              depends = flint_depends),
    487487
    488488    Extension('sage.groups.perm_gps.partn_ref.refinement_lists',
    489489              sources = ['sage/groups/perm_gps/partn_ref/refinement_lists.pyx'],
    490490              libraries = ['gmp', 'flint'],
    491               include_dirs = [SAGE_INC + 'FLINT/'],
     491              include_dirs = [SAGE_INC + 'flint/'],
    492492              extra_compile_args = ['-std=c99'],
    493493              depends = flint_depends),
    494494
    495495    Extension('sage.groups.perm_gps.partn_ref.refinement_matrices',
    496496              sources = ['sage/groups/perm_gps/partn_ref/refinement_matrices.pyx'],
    497497              libraries = ['gmp', 'flint'],
    498               include_dirs = [SAGE_INC + 'FLINT/'],
     498              include_dirs = [SAGE_INC + 'flint/'],
    499499              extra_compile_args = ['-std=c99'],
    500500              depends = flint_depends),
    501501
    502502    Extension('sage.groups.perm_gps.partn_ref.refinement_python',
    503503              sources = ['sage/groups/perm_gps/partn_ref/refinement_python.pyx'],
    504504              libraries = ['gmp', 'flint'],
    505               include_dirs = [SAGE_INC + 'FLINT/'],
     505              include_dirs = [SAGE_INC + 'flint/'],
    506506              extra_compile_args = ['-std=c99'],
    507507              depends = flint_depends),
    508508
     
    577577    Extension('sage.libs.flint.flint',
    578578              sources = ["sage/libs/flint/flint.pyx"],
    579579              libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"],
    580               include_dirs = [SAGE_INC + 'FLINT/'],
     580              include_dirs = [SAGE_INC + 'flint/'],
    581581              extra_compile_args=["-std=c99", "-D_XPG6"],
    582582              depends = flint_depends),
    583583
    584584    Extension('sage.libs.flint.fmpz_poly',
    585585              sources = ["sage/libs/flint/fmpz_poly.pyx"],
    586586              libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"],
    587               include_dirs = [SAGE_INC + 'FLINT/'],
     587              include_dirs = [SAGE_INC + 'flint/'],
    588588              extra_compile_args=["-std=c99", "-D_XPG6"],
    589589              depends = flint_depends),
    590590   
     
    11331133    Extension('sage.modular.modform.eis_series_cython',
    11341134              sources = ['sage/modular/modform/eis_series_cython.pyx'],
    11351135              libraries = ["gmp", "flint"],
    1136               include_dirs = [SAGE_INC + 'FLINT/'],
     1136              include_dirs = [SAGE_INC + 'flint/'],
    11371137              extra_compile_args = ['-std=c99'],
    11381138              depends = flint_depends),
    11391139
    11401140    Extension('sage.modular.modsym.apply',
    11411141              sources = ['sage/modular/modsym/apply.pyx'],
    11421142              libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"],
    1143               include_dirs = [SAGE_INC + 'FLINT/'],
     1143              include_dirs = [SAGE_INC + 'flint/'],
    11441144              extra_compile_args=["-std=c99",  "-D_XPG6"],
    11451145              depends = flint_depends),
    11461146
     
    11501150    Extension('sage.modular.modsym.heilbronn',
    11511151              sources = ['sage/modular/modsym/heilbronn.pyx'],
    11521152              libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"],
    1153               include_dirs = [SAGE_INC + 'FLINT/'],
     1153              include_dirs = [SAGE_INC + 'flint/'],
    11541154              extra_compile_args=["-std=c99", "-D_XPG6"],
    11551155              depends = flint_depends),
    11561156
     
    13251325    Extension('sage.rings.integer',
    13261326              sources = ['sage/rings/integer.pyx'],
    13271327              libraries=['ntl', 'pari', 'flint', 'gmp'],
    1328               include_dirs = [SAGE_INC + 'FLINT/'],
     1328              include_dirs = [SAGE_INC + 'flint/'],
    13291329              depends = numpy_depends + flint_depends),
    13301330
    13311331    Extension('sage.rings.integer_ring',
     
    13471347              sources = ['sage/rings/fraction_field_FpT.pyx'],
    13481348              libraries = ["csage", "flint", "gmp", "gmpxx", "ntl", "zn_poly"],
    13491349              extra_compile_args=["-std=c99", "-D_XPG6"],
    1350               include_dirs = [SAGE_INC + 'FLINT/'],
     1350              include_dirs = [SAGE_INC + 'flint/'],
    13511351              depends = flint_depends),
    13521352   
    13531353    Extension('sage.rings.laurent_series_ring_element',
     
    16171617              sources = ['sage/rings/polynomial/polynomial_zmod_flint.pyx'],
    16181618              libraries = ["csage", "flint", "gmp", "gmpxx", "ntl", "zn_poly"],
    16191619              extra_compile_args=["-std=c99", "-D_XPG6"],
    1620               include_dirs = [SAGE_INC + 'FLINT/'],
     1620              include_dirs = [SAGE_INC + 'flint/'],
    16211621              depends = flint_depends),
    16221622
    16231623    Extension('sage.rings.polynomial.polynomial_integer_dense_flint',
    16241624              sources = ['sage/rings/polynomial/polynomial_integer_dense_flint.pyx'],
    16251625              language = 'c++',
    16261626              libraries = ["csage", "flint", "ntl", "gmpxx", "gmp"],
    1627               include_dirs = [SAGE_INC + 'FLINT/'],
     1627              include_dirs = [SAGE_INC + 'flint/'],
    16281628              depends = flint_depends),
    16291629
    16301630    Extension('sage.rings.polynomial.polynomial_integer_dense_ntl',
     
    16381638              language = 'c++',
    16391639              extra_compile_args=["-std=c99"] + uname_specific('SunOS', [], ['-D_XPG6']),
    16401640              libraries = ["csage", "flint", "ntl", "gmpxx", "gmp"],
    1641               include_dirs = [SAGE_INC + 'FLINT/', 'sage/libs/flint/'],
     1641              include_dirs = [SAGE_INC + 'flint/', 'sage/libs/flint/'],
    16421642              depends = flint_depends),
    16431643
    16441644    Extension('sage.rings.polynomial.polynomial_modn_dense_ntl',
     
    16811681              depends = [SAGE_INC + 'ratpoints.h',
    16821682                         SAGE_INC + 'gmp.h'] +
    16831683                         flint_depends,
    1684               include_dirs = [SAGE_INC + 'FLINT/'],
     1684              include_dirs = [SAGE_INC + 'flint/'],
    16851685              libraries = ['flint', 'gmp', 'ratpoints']),
    16861686
    16871687    Extension('sage.schemes.generic.toric_divisor_class',
     
    17101710    Extension('sage.sets.disjoint_set',
    17111711              sources = ['sage/sets/disjoint_set.pyx'],
    17121712              libraries = ['gmp', 'flint'],
    1713               include_dirs = [SAGE_INC + 'FLINT/'],
     1713              include_dirs = [SAGE_INC + 'flint/'],
    17141714              extra_compile_args = ['-std=c99'],
    17151715              depends = flint_depends),
    17161716
  • 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
    5454