Ticket #14268: 14268_remove_c99.patch

File 14268_remove_c99.patch, 10.6 KB (added by jdemeyer, 9 years ago)

  • module_list.py 

    # HG changeset patch
# User Jeroen Demeyer <jdemeyer@cage.ugent.be>
# Date 1363274543 -3600
# Node ID c004d5860ebe809507a52f92ac45471e126a7065
# Parent  58b0b7a8d08079ccbea5bc4117368ddd9e89e6bb
Remove c99 options (Sage's Python now uses c99 by default)

diff --git a/module_list.py b/module_list.py
    a b  
    278278   
    279279    Extension('sage.ext.multi_modular',
    280280              sources = ['sage/ext/multi_modular.pyx'],
    281               extra_compile_args = ['-std=c99'],
    282281              libraries=['gmp']),
    283282
    284283    Extension('sage.ext.pselect',
    … …  
    396395              sources = ['sage/graphs/matchpoly.pyx'],
    397396              libraries = ['gmp', 'flint'],
    398397              include_dirs = [SAGE_INC + 'FLINT/'],
    399               extra_compile_args = ['-std=c99'],
    400398              depends = flint_depends),
    401399
    402400    Extension('sage.graphs.planarity',
    … …  
    506504              sources = ['sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pyx'],
    507505              libraries = ['gmp', 'flint'],
    508506              include_dirs = [SAGE_INC + 'FLINT/'],
    509               extra_compile_args = ['-std=c99'],
    510507              depends = flint_depends),
    511508
    512509    Extension('sage.groups.perm_gps.partn_ref.canonical_augmentation',
    513510              sources = ['sage/groups/perm_gps/partn_ref/canonical_augmentation.pyx'],
    514511              libraries = ['gmp', 'flint'],
    515512              include_dirs = [SAGE_ROOT + '/local/include/FLINT/'],
    516               extra_compile_args = ['-std=c99'],
    517513              depends = [SAGE_ROOT + "/local/include/FLINT/flint.h"]),
    518514
    519515    Extension('sage.groups.perm_gps.partn_ref.double_coset',
    520516              sources = ['sage/groups/perm_gps/partn_ref/double_coset.pyx'],
    521517              libraries = ['gmp', 'flint'],
    522518              include_dirs = [SAGE_INC + 'FLINT/'],
    523               extra_compile_args = ['-std=c99'],
    524519              depends = flint_depends),
    525520
    526521    Extension('sage.groups.perm_gps.partn_ref.refinement_binary',
    527522              sources = ['sage/groups/perm_gps/partn_ref/refinement_binary.pyx'],
    528523              libraries = ['gmp', 'flint'],
    529524              include_dirs = [SAGE_INC + 'FLINT/'],
    530               extra_compile_args = ['-std=c99'],
    531525              depends = flint_depends),
    532526
    533527    Extension('sage.groups.perm_gps.partn_ref.refinement_graphs',
    534528              sources = ['sage/groups/perm_gps/partn_ref/refinement_graphs.pyx'],
    535529              libraries = ['gmp', 'flint'],
    536530              include_dirs = [SAGE_INC + 'FLINT/'],
    537               extra_compile_args = ['-std=c99'],
    538531              depends = flint_depends),
    539532
    540533    Extension('sage.groups.perm_gps.partn_ref.refinement_lists',
    541534              sources = ['sage/groups/perm_gps/partn_ref/refinement_lists.pyx'],
    542535              libraries = ['gmp', 'flint'],
    543536              include_dirs = [SAGE_INC + 'FLINT/'],
    544               extra_compile_args = ['-std=c99'],
    545537              depends = flint_depends),
    546538
    547539    Extension('sage.groups.perm_gps.partn_ref.refinement_matrices',
    548540              sources = ['sage/groups/perm_gps/partn_ref/refinement_matrices.pyx'],
    549541              libraries = ['gmp', 'flint'],
    550542              include_dirs = [SAGE_INC + 'FLINT/'],
    551               extra_compile_args = ['-std=c99'],
    552543              depends = flint_depends),
    553544
    554545    Extension('sage.groups.perm_gps.partn_ref.refinement_python',
    555546              sources = ['sage/groups/perm_gps/partn_ref/refinement_python.pyx'],
    556547              libraries = ['gmp', 'flint'],
    557548              include_dirs = [SAGE_INC + 'FLINT/'],
    558               extra_compile_args = ['-std=c99'],
    559549              depends = flint_depends),
    560550
    561551    Extension('sage.groups.perm_gps.partn_ref.refinement_sets',
    562552              sources = ['sage/groups/perm_gps/partn_ref/refinement_sets.pyx'],
    563553              libraries = ['gmp', 'flint'],
    564554              include_dirs = [SAGE_ROOT + '/local/include/FLINT/'],
    565               extra_compile_args = ['-std=c99'],
    566555              depends = [SAGE_ROOT + "/local/include/FLINT/flint.h"]),
    567556
    568557    ################################
    … …  
    637626              sources = ["sage/libs/flint/flint.pyx"],
    638627              libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"],
    639628              include_dirs = [SAGE_INC + 'FLINT/'],
    640               extra_compile_args=["-std=c99", "-D_XPG6"],
    641629              depends = flint_depends),
    642630
    643631    Extension('sage.libs.flint.fmpz_poly',
    644632              sources = ["sage/libs/flint/fmpz_poly.pyx"],
    645633              libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"],
    646634              include_dirs = [SAGE_INC + 'FLINT/'],
    647               extra_compile_args=["-std=c99", "-D_XPG6"],
    648635              depends = flint_depends),
    649636   
    650637    Extension('sage.libs.fplll.fplll',
    … …  
    10171004    # TODO -- change to use BLAS at some point.
    10181005    Extension('sage.matrix.matrix_integer_dense',
    10191006              sources = ['sage/matrix/matrix_integer_dense.pyx'],
    1020               extra_compile_args = ['-std=c99'] + m4ri_extra_compile_args,
     1007              extra_compile_args = m4ri_extra_compile_args,
    10211008              depends = [SAGE_INC + 'm4ri/m4ri.h'],
    10221009              # order matters for cygwin!!
    10231010              libraries = ['iml', 'pari', 'gmp', 'm', BLAS, BLAS2]),
    … …  
    10291016    Extension('sage.matrix.matrix_mod2_dense',
    10301017              sources = ['sage/matrix/matrix_mod2_dense.pyx'],
    10311018              libraries = ['gmp','m4ri', 'gd', 'png12', 'z'],
    1032               extra_compile_args = ['-std=c99'] + m4ri_extra_compile_args,
     1019              extra_compile_args = m4ri_extra_compile_args,
    10331020              depends = [SAGE_INC + "png.h", SAGE_INC + "m4ri/m4ri.h"]),
    10341021
    10351022    Extension('sage.matrix.matrix_mod2e_dense',
    … …  
    12281215              sources = ['sage/modular/modform/eis_series_cython.pyx'],
    12291216              libraries = ["gmp", "flint"],
    12301217              include_dirs = [SAGE_INC + 'FLINT/'],
    1231               extra_compile_args = ['-std=c99'],
    12321218              depends = flint_depends),
    12331219
    12341220    Extension('sage.modular.modsym.apply',
    12351221              sources = ['sage/modular/modsym/apply.pyx'],
    12361222              libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"],
    12371223              include_dirs = [SAGE_INC + 'FLINT/'],
    1238               extra_compile_args=["-std=c99",  "-D_XPG6"],
    12391224              depends = flint_depends),
    12401225
    12411226    Extension('sage.modular.modsym.relation_matrix_pyx',
    … …  
    12451230              sources = ['sage/modular/modsym/heilbronn.pyx'],
    12461231              libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"],
    12471232              include_dirs = [SAGE_INC + 'FLINT/'],
    1248               extra_compile_args=["-std=c99", "-D_XPG6"],
    12491233              depends = flint_depends),
    12501234
    12511235    Extension('sage.modular.modsym.p1list',
    … …  
    12851269              libraries = ['gmp']),
    12861270
    12871271    Extension('sage.modules.vector_modn_dense',
    1288               extra_compile_args = ['-std=c99'],
    12891272              sources = ['sage/modules/vector_modn_dense.pyx']),
    12901273
    12911274    Extension('sage.modules.vector_mod2_dense',
    12921275              sources = ['sage/modules/vector_mod2_dense.pyx'],
    12931276              libraries = ['gmp','m4ri', 'png12', 'gd'],
    1294               extra_compile_args = ['-std=c99'] + m4ri_extra_compile_args,
     1277              extra_compile_args = m4ri_extra_compile_args,
    12951278              depends = [SAGE_INC + "png.h", SAGE_INC + "m4ri/m4ri.h"]),
    12961279   
    12971280    Extension('sage.modules.vector_rational_dense',
    … …  
    13531336              depends = numpy_depends),
    13541337   
    13551338    Extension('sage.plot.plot3d.base',
    1356               sources = ['sage/plot/plot3d/base.pyx'],
    1357               extra_compile_args=["-std=c99"]),
     1339              sources = ['sage/plot/plot3d/base.pyx']),
    13581340   
    13591341    Extension('sage.plot.plot3d.implicit_surface',
    13601342              sources = ['sage/plot/plot3d/implicit_surface.pyx'],
    … …  
    13631345              depends = numpy_depends),
    13641346   
    13651347    Extension('sage.plot.plot3d.index_face_set',
    1366               sources = ['sage/plot/plot3d/index_face_set.pyx'],
    1367               extra_compile_args=["-std=c99"]),
     1348              sources = ['sage/plot/plot3d/index_face_set.pyx']),
    13681349   
    13691350    Extension('sage.plot.plot3d.parametric_surface',
    13701351              sources = ['sage/plot/plot3d/parametric_surface.pyx']),
    … …  
    14151396
    14161397    Extension('sage.rings.complex_double',
    14171398              sources = ['sage/rings/complex_double.pyx'],
    1418               extra_compile_args=["-std=c99",  "-D_XPG6"],
    14191399              libraries = (['gsl', BLAS, BLAS2, 'pari', 'gmp', 'm'])),
    14201400
    14211401    Extension('sage.rings.complex_interval',
    … …  
    14511431    Extension('sage.rings.fraction_field_FpT',
    14521432              sources = ['sage/rings/fraction_field_FpT.pyx'],
    14531433              libraries = ["csage", "flint", "gmp", "gmpxx", "ntl", "zn_poly"],
    1454               extra_compile_args=["-std=c99", "-D_XPG6"],
    14551434              include_dirs = [SAGE_INC + 'FLINT/'],
    14561435              depends = flint_depends),
    14571436   
    … …  
    17311710    Extension('sage.rings.polynomial.polynomial_zmod_flint',
    17321711              sources = ['sage/rings/polynomial/polynomial_zmod_flint.pyx'],
    17331712              libraries = ["csage", "flint", "gmp", "gmpxx", "ntl", "zn_poly"],
    1734               extra_compile_args=["-std=c99", "-D_XPG6"],
    17351713              include_dirs = [SAGE_INC + 'FLINT/'],
    17361714              depends = flint_depends),
    17371715
    … …  
    17511729    Extension('sage.rings.polynomial.polynomial_rational_flint',
    17521730              sources = ['sage/rings/polynomial/polynomial_rational_flint.pyx', 'sage/libs/flint/fmpq_poly.c'],
    17531731              language = 'c++',
    1754               extra_compile_args=["-std=c99"] + uname_specific('SunOS', [], ['-D_XPG6']),
    17551732              libraries = ["csage", "flint", "ntl", "gmpxx", "gmp"],
    17561733              include_dirs = [SAGE_INC + 'FLINT/', 'sage/libs/flint/'],
    17571734              depends = flint_depends),
    … …  
    17921769
    17931770    Extension('sage.schemes.elliptic_curves.descent_two_isogeny',
    17941771              sources = ['sage/schemes/elliptic_curves/descent_two_isogeny.pyx'],
    1795               extra_compile_args=["-std=c99"],
    17961772              depends = [SAGE_INC + 'ratpoints.h',
    17971773                         SAGE_INC + 'gmp.h'] +
    17981774                         flint_depends,
    … …  
    18261802              sources = ['sage/sets/disjoint_set.pyx'],
    18271803              libraries = ['gmp', 'flint'],
    18281804              include_dirs = [SAGE_INC + 'FLINT/'],
    1829               extra_compile_args = ['-std=c99'],
    18301805              depends = flint_depends),
    18311806
    18321807    ################################
    … …  
    18451820              sources = ['sage/stats/hmm/hmm.pyx']),
    18461821
    18471822    Extension('sage.stats.hmm.chmm',
    1848               sources = ['sage/stats/hmm/chmm.pyx'],
    1849               extra_compile_args=["-std=c99"]),
     1823              sources = ['sage/stats/hmm/chmm.pyx']),
    18501824   
    18511825    Extension('sage.stats.intlist',
    18521826              sources = ['sage/stats/intlist.pyx']),