Ticket #1184: Sage-2.8.15.alpha1-twiddle-with-link-order.patch

File Sage-2.8.15.alpha1-twiddle-with-link-order.patch, 2.6 KB (added by Michael Abshoff, 15 years ago)
  • setup.py

    # HG changeset patch
    # User mabshoff@michael-abshoffs-ibook-g4.local
    # Date 1196413224 -3600
    # Node ID 5b23d9a6af6c78bac304da1c89e7b4f1db93769f
    # Parent  fafd31d0a9c5b01562a5d3c1d3bd176ccd4f1d51
    fix various build issues related to "NTL has hard-coded link paths" issue (#1184)
    
    diff -r fafd31d0a9c5 -r 5b23d9a6af6c setup.py
    a b linbox = Extension('sage.libs.linbox.lin 
    286286
    287287libsingular = Extension('sage.libs.singular.singular',
    288288                        sources = ['sage/libs/singular/singular.pyx'],
    289                         libraries = ['gmp', 'm', 'readline', 'singular', 'singfac', 'singcf', 'omalloc', 'givaro', 'gmpxx'],
     289                        libraries = ['m', 'readline', 'singular', 'singfac', 'singcf', 'omalloc', 'givaro', 'gmpxx', 'gmp'],
    290290                        language="c++",
    291291                        include_dirs=[SAGE_ROOT +'/local/include/singular']
    292292                        )
    matrix_cyclo_sparse = Extension('sage.ma 
    362362
    363363matrix_mpolynomial_dense = Extension('sage.matrix.matrix_mpolynomial_dense',
    364364                                     ['sage/matrix/matrix_mpolynomial_dense.pyx'],
    365                                      libraries = ['gmp', 'm', 'readline', 'singular', 'singcf', 'singfac', 'omalloc', 'givaro', 'gmpxx'],
     365                                     libraries = ['m', 'readline', 'singular', 'singcf', 'singfac', 'omalloc', 'givaro', 'gmpxx', 'gmp'],
    366366                                     language="c++",
    367367                                     include_dirs=[SAGE_ROOT +'/local/include/singular'])
    368368
    ext_modules = [ \ 
    615615
    616616    Extension('sage.rings.polynomial.multi_polynomial_libsingular',
    617617              sources = ['sage/rings/polynomial/multi_polynomial_libsingular.pyx'],
    618               libraries = ['gmp', 'm', 'readline', 'singular', 'singcf', 'singfac', 'omalloc', 'givaro', 'gmpxx'],
     618              libraries = ['m', 'readline', 'singular', 'singcf', 'singfac', 'omalloc', 'givaro', 'gmpxx', 'gmp'],
    619619              language="c++",
    620620              include_dirs=[SAGE_ROOT +'/local/include/singular']), \
    621621
    622622    Extension('sage.rings.polynomial.multi_polynomial_ideal_libsingular',
    623623              sources = ['sage/rings/polynomial/multi_polynomial_ideal_libsingular.pyx'],
    624               libraries = ['gmp', 'm', 'readline', 'singular', 'singcf', 'singfac', 'omalloc', 'givaro', 'gmpxx'],
     624              libraries = ['m', 'readline', 'singular', 'singcf', 'singfac', 'omalloc', 'givaro', 'gmpxx', 'gmp'],
    625625              language="c++",
    626626              include_dirs=[SAGE_ROOT +'/local/include/singular']), \
    627627