Ticket #9475: trac_9475-libm4ri-20100701.p1-based_on_p0.patch

File trac_9475-libm4ri-20100701.p1-based_on_p0.patch, 7.1 KB (added by leif, 11 years ago)

You have to commit Martin's changes ("p0") first to apply this.

  • SPKG.txt

    # HG changeset patch
    # User Leif Leonhardy <not.really@online.de>
    # Date 1279245132 -7200
    # Node ID fad5d3cf0f23970d11340c6dc93a738de77552c4
    # Parent  e8a55794b7baae93a999162d6017df2ba8e3299c
    #9475 libm4ri-20100701.p1 (changes relative to inofficial p0)
    
    === libm4ri-20100701.p1 (Leif Leonhardy, July 15th 2010) ===
     * Committed Martin Albrecht's changes of July 13th (minor fixes, see #9475).
     * SPKG.txt:
       - Added "License" and "Special Update/Build Instructions" sections,
         fixed some typos, some additions.
     * spkg-install:
       - Fixed old typo (CLFAGS), fixed syntax error due to missing spaces that
         prevented SAGE_FAT_BINARY working.
       - Renamed $SSE2_SUPPORT to $DISABLE_SSE2.
       - Removed $SAGE_LOCAL/include from preprocessor search path since M4RI
         doesn't depend on any Sage package (similarly for library search path).
       - Removed redundant --includedir=... from configure.
       - Some restructuring.
     * spkg-check:
       - Replaced "make" by "$MAKE".
       - *Append* "-m64" to $CFLAGS rather than overwrite them if $SAGE64 is "yes".
     * Removed extra baggage (see "Special Update/Build Instructions" above).
     * (Note: There was no official p0. The above changes are all #9475.)
    
    diff -r e8a55794b7ba -r fad5d3cf0f23 SPKG.txt
    a b  
    33== Description ==
    44
    55Library for matrix multiplication, reduction and inversion over GF(2).
     6(See also src/README for a brief overview.)
     7
     8== License ==
     9
     10 * GNU General Public License Version 2 or later (see src/COPYING)
    611
    712== Maintainers ==
    813
     
    1015
    1116== Upstream Contact ==
    1217
    13  * Author: Gregory Bard and Martin Albrecht
    14  * Email: M.R.Albrecht@rhul.ac.uk
     18 * Authors: Gregory Bard and Martin Albrecht
     19 * Email:   M.R.Albrecht@rhul.ac.uk (alternatively martinralbrecht@googlemail.com)
    1520 * Website: http://m4ri.sagemath.org
    1621
    1722== Dependencies ==
    1823
    19  None
     24 None (Note: If this ever changes, edit spkg-install accordingly, too.)
    2025 
    21 == Releases ==
     26== Special Update/Build Instructions ==
     27 * Delete the upstream Mercurial repository (file src/.hgtags, directory src/.hg).
     28 * Delete the directory src/autom4te.cache (if present).
     29 * Delete m4ri.vcproj (and perhaps other unnecessary baggage).
     30 * Touch src/configure to make sure it is newer than its sources.
     31
     32== Releases/Changelog ==
     33
     34=== libm4ri-20100701.p1 (Leif Leonhardy, July 15th 2010) ===
     35 * Committed Martin Albrecht's changes of July 13th (minor fixes, see #9475).
     36 * SPKG.txt:
     37   - Added "License" and "Special Update/Build Instructions" sections,
     38     fixed some typos, some additions.
     39 * spkg-install:
     40   - Fixed old typo (CLFAGS), fixed syntax error due to missing spaces that
     41     prevented SAGE_FAT_BINARY working.
     42   - Renamed $SSE2_SUPPORT to $DISABLE_SSE2.
     43   - Removed $SAGE_LOCAL/include from preprocessor search path since M4RI
     44     doesn't depend on any Sage package (similarly for library search path).
     45   - Removed redundant --includedir=... from configure.
     46   - Some restructuring.
     47 * spkg-check:
     48   - Replaced "make" by "$MAKE".
     49   - *Append* "-m64" to $CFLAGS rather than overwrite them if $SAGE64 is "yes".
     50 * Removed extra baggage (see "Special Update/Build Instructions" above).
     51 * (Note: There was no official p0. The above changes are all #9475.)
    2252
    2353=== libm4ri-20100701 (Martin Albrecht, July 11th, 2010) ===
    2454 * new upstream release
    25    + refactoring (function names match what the function is doing now)
     55   + refactoring (function names now match what the function is doing)
    2656   + heuristic algorithm choice for RREF
    2757   + OpenMP tuning and fixes
    28    + new option to supress SSE2 instruction
     58   + new option to suppress SSE2 instructions
    2959 * respecting SAGE_FAT_BINARY (cf. #9381)
    3060 * adding spkg-check (cf. #9281)
    3161
  • spkg-check

    diff -r e8a55794b7ba -r fad5d3cf0f23 spkg-check
    a b  
    1 #!/usr/bin/env bash 
    2  
     1#!/usr/bin/env bash
     2
    33unset RM
    44
    5 if [ "$SAGE_LOCAL" = "" ]; then
    6     echo "SAGE_LOCAL undefined ... exiting";
    7     echo "Maybe run 'sage -sh'?"
    8     exit 1
    9 fi
    10            
    11 if [ "$SAGE64" = "yes" ]; then
    12     CFLAGS="-m64 "; export CFLAGS
    13 fi
    14                  
    15 cd src 
    16                    
    17 echo "Testing the M4RI library"
    18                    
    19 make check 
    20                      
    21 if [ $? -ne 0 ]; then
    22     echo "Error testing M4RI"
    23     exit 1
    24 fi
     5if [ "$SAGE_LOCAL" = "" ]; then
     6    echo "SAGE_LOCAL undefined ... exiting"
     7    echo "Maybe run 'sage -sh'?"
     8    exit 1
     9fi
     10
     11if [ "$SAGE64" = "yes" ]; then
     12    CFLAGS="$CFLAGS -m64"; export CFLAGS
     13    # FIXME: Do we need LDFLAGS here, too?
     14    #        But looks as if all linking is performed by libtool/
     15    #        gcc, so we do not really need it here.
     16    #        In general, "-m64" should be added to CPPFLAGS and
     17    #        CXXFLAGS as well. (There are no C++ sources though.)
     18fi
     19
     20cd src
     21
     22echo "Testing the M4RI library"
     23
     24$MAKE check
     25
     26if [ $? -ne 0 ]; then
     27    echo "Error testing M4RI"
     28    exit 1
     29fi
     30
  • spkg-install

    diff -r e8a55794b7ba -r fad5d3cf0f23 spkg-install
    a b  
    11#!/usr/bin/env bash
    22
    33if [ "$SAGE_LOCAL" = "" ]; then
    4    echo "SAGE_LOCAL undefined ... exiting";
     4   echo "SAGE_LOCAL undefined ... exiting"
    55   echo "Maybe run 'sage -sh'?"
    66   exit 1
    77fi
    88
    99unset RM
    1010
     11# M4RI (currently) does not depend on any Sage package,
     12# so we don't need this:
     13# INCLUDES="-I$SAGE_LOCAL/include"
     14# LIBDIRS="-L$SAGE_LOCAL/lib"
     15INCLUDES=""
     16LIBDIRS=""
     17
     18CFLAGS="$CFLAGS $INCLUDES $LIBDIRS -g"
     19
    1120COMPILER=`./testcc.sh`
    1221
    13 cd src
    14 
    15 $MAKE clean
    16 
    17 INCLUDES="-I$SAGE_LOCAL/include/"
    18 
    19 CFLAGS="$CFLAGS $INCLUDES -L$SAGE_LOCAL/lib -g"
    20 
    21 
    22 if [ "x$COMPILER"  = "xGNU" ] ; then
    23    CFLAGS="$CFLAGS -fPIC -Wall -pedantic "
    24 elif [ "x$COMPILER" = "xSun_on_Solaris" ] ; then
    25    CLFAGS="$CLFAGS -Kpic "
     22if [ "x$COMPILER"  = "xGNU" ] ; then
     23   CFLAGS="$CFLAGS -fPIC -Wall -pedantic"
     24elif [ "x$COMPILER" = "xSun_on_Solaris" ] ; then
     25   CFLAGS="$CFLAGS -Kpic"
    2626elif [ "x$COMPILER" = "xHP_on_HPUX" ] ; then
    27    CFLAGS="$CFLAGS + z "
     27   CFLAGS="$CFLAGS + z"
    2828fi
    2929
    3030CPPFLAGS="$INCLUDES"
     
    3939
    4040if [ "x$SAGE64" = "xyes" ]; then
    4141    CFLAGS="$CFLAGS -m64"
     42    CPPFLAGS="$CPPFLAGS -m64"
     43    # FIXME: Do we need LDFLAGS here, too?
     44    #        But looks as if all linking is performed by libtool/
     45    #        gcc, so we do not really need it here.
    4246fi
    4347
    4448export CFLAGS
    4549export CPPFLAGS
     50# export LDFLAGS
    4651
    47 if ["x$SAGE_FAT_BINARY" = "xyes"]; then
    48     SSE2_SUPPORT="--disable-sse2"
     52if [ "x$SAGE_FAT_BINARY" = "xyes" ]; then
     53    DISABLE_SSE2="--disable-sse2"
    4954else
    50     SSE2_SUPPORT=""
     55    DISABLE_SSE2=""
    5156fi
    5257
    53 ./configure --prefix=$SAGE_LOCAL --includedir=$SAGE_LOCAL/include/ $ENABLE_DEBUG $SSE2_SUPPORT
     58
     59cd src
     60
     61$MAKE clean
     62
     63./configure --prefix=$SAGE_LOCAL $ENABLE_DEBUG $DISABLE_SSE2
    5464
    5565if [ $? -ne 0 ]; then
    5666    echo "Error configuring libm4ri"
     
    5868fi
    5969
    6070$MAKE
     71
    6172if [ $? -ne 0 ]; then
    6273    echo "Error building libm4ri"
    6374    exit 1
    6475fi
    6576
    6677$MAKE install
     78
    6779if [ $? -ne 0 ]; then
    6880    echo "Error installing libm4ri"
    6981    exit 1