Ticket #14268: flint-1.5.2.p4.diff

File flint-1.5.2.p4.diff, 5.0 KB (added by jdemeyer, 9 years ago)

  • SPKG.txt 

    # HG changeset patch
# User Jeroen Demeyer <jdemeyer@cage.ugent.be>
# Date 1363270089 -3600
# Node ID 1c581db7befb005970be1c6d42976a30aecbf615
# Parent  e2efcb17e216a2051633da1de0bb9545471af719
#14268: ulong.patch: replace the #define ulong by a typedef
Undo the fixes from flint-1.5.0.p6 which are now no longer needed.
Remove -funroll-loops work-around for old gcc versions.
Remove unused FLINT_QD_LIB_DIR and FLINT_QD_INCLUDE_DIR
Use bash "export VAR=VALUE" syntax in spkg-install.

diff --git a/SPKG.txt b/SPKG.txt
    a b  
    3737
    3838== Changelog ==
    3939
     40=== flint-1.5.2.p4 (Jeroen Demeyer, 14 March 2013) ===
     41  * #14268: ulong.patch: replace the #define ulong by a typedef which
     42    is compatible with glibc's <sys/types.h> in -std=gnu99 mode.
     43  * Undo the fixes from flint-1.5.0.p6 which are now no longer needed.
     44  * Remove -funroll-loops work-around for old gcc versions.
     45  * Remove unused FLINT_QD_LIB_DIR and FLINT_QD_INCLUDE_DIR
     46  * Use bash "export VAR=VALUE" syntax in spkg-install.
     47
    4048=== flint-1.5.2.p3 (Timo Kluck, 7 March 2013) ===
    4149  * #14241: Fix double // path separators in longlong.patch
    4250

  • deleted file patches/ZmodF_mul.c.patch 

    diff --git a/patches/ZmodF_mul.c.patch b/patches/ZmodF_mul.c.patch
deleted file mode 100644
    + -  
    1 --- src/ZmodF_mul.c     2009-09-23 18:03:27.000000000 +0800
    2 +++ patches/ZmodF_mul.c 2011-04-25 22:32:40.000000000 +0800
    3 @@ -30,7 +30,6 @@
    4  ******************************************************************************/
    5  
    6  #include <math.h>
    7 -#include "ZmodF.h"
    8  #include "ZmodF_poly.h"
    9  #include "ZmodF_mul.h"
    10  #include "mpn_extras.h"

  • deleted file patches/ZmodF_poly.c.patch 

    diff --git a/patches/ZmodF_poly.c.patch b/patches/ZmodF_poly.c.patch
deleted file mode 100644
    + -  
    1 --- src/ZmodF_poly.c    2009-09-23 18:03:27.000000000 +0800
    2 +++ patches/ZmodF_poly.c        2011-04-25 22:37:17.000000000 +0800
    3 @@ -29,8 +29,6 @@
    4  
    5  *****************************************************************************/
    6  
    7 -#include "flint.h"
    8 -#include "memory-manager.h"
    9  #include "ZmodF_poly.h"
    10  #include "ZmodF_mul.h"
    11  #include "fmpz_poly.h"

  • deleted file patches/mpn_extras.h.patch 

    diff --git a/patches/mpn_extras.h.patch b/patches/mpn_extras.h.patch
deleted file mode 100644
    + -  
    1 --- src/mpn_extras.h    2009-09-23 03:03:27.000000000 -0700
    2 +++ patches/mpn_extras.h        2011-12-20 15:47:18.495311148 -0800
    3 @@ -22,7 +22,6 @@
    4  #ifndef MPN_EXTRAS_H
    5  #define MPN_EXTRAS_H
    6  
    7 -#include "flint.h"
    8  #include "ZmodF_poly.h"
    9  
    10  #include "longlong_wrapper.h"

  • new file patches/ulong.patch 

    diff --git a/patches/ulong.patch b/patches/ulong.patch
new file mode 100644
    - +  
     1diff -ru src/flint.h b/flint.h
     2--- src/flint.h 2012-08-03 11:42:57.000000000 +0200
     3+++ b/flint.h   2013-03-14 14:55:02.997513830 +0100
     4@@ -134,7 +134,7 @@
     5 
     6 #define FLINT_POL_DIV_1_LENGTH 10
     7 
     8-#define ulong unsigned long
     9+typedef unsigned long ulong;
     10 
     11 #if FLINT_BITS == 32
     12 #define half_ulong uint16_t

  • spkg-install 

    diff --git a/spkg-install b/spkg-install
    a b  
    1212   mv $SAGE_LOCAL/lib/libntl.a $SAGE_LOCAL/lib/xxx_libntl.a
    1313fi
    1414
    15 if [ "`uname`" = "Linux" -a "`uname -m`" = "x86_64" ]; then
    16    # This line causes *MAJOR* Illegal Instruction problems on
    17    # 64-bit Pentium 4's.  Do *not* do that!!  Only enable the
    18    # opteron stuff with a surefire way of detecting that a
    19    # machine is really an opteron.
    20    #FLINT_TUNE="-mtune=opteron -march=opteron -fPIC -funroll-loops "
    21 
    22    FLINT_TUNE="-fPIC -funroll-loops "
    23 elif [ "`uname`" = "Darwin" -a "`uname -m`" = "Power Macintosh" ]; then
    24    FLINT_TUNE=" -fPIC -funroll-loops "
    25 elif [ "`uname -m`" = "ia64" ]; then 
    26    # -funroll-loops crashes the build on itanium under GCC-4.2.1, as reported by
    27    # Kate Minola.
    28    echo "Turning off loop unrolling on Linux/Itanium"
    29    FLINT_TUNE=" -fPIC "
    30 elif [ "`uname`" = "SunOS" -a "`uname -p`" = "sparc" ]; then
    31    # -funroll-loops crashes the build on an US IIIi under GCC-4.3.2, as reported by
    32    # Michael Abshoff
    33    echo "Turning off loop unrolling on Solaris/Sparc"
    34    FLINT_TUNE=" -fPIC "
    35 else
    36    FLINT_TUNE=" -fPIC -funroll-loops  "
    37 fi
     15FLINT_TUNE=" -fPIC -funroll-loops "
    3816
    3917if [ -z "$CFLAG64" ] ; then
    4018    CFLAG64=-m64
    … …  
    5230
    5331export FLINT_TUNE
    5432
    55 FLINT_GMP_INCLUDE_DIR="$SAGE_LOCAL"/include/
    56 FLINT_GMP_LIB_DIR="$SAGE_LOCAL"/lib/
     33export FLINT_GMP_INCLUDE_DIR="$SAGE_LOCAL"/include/
     34export FLINT_GMP_LIB_DIR="$SAGE_LOCAL"/lib/
     35export FLINT_NTL_INCLUDE_DIR="$SAGE_LOCAL"/include
     36export FLINT_NTL_LIB_DIR="$SAGE_LOCAL"/lib/
    5737
    58 FLINT_NTL_INCLUDE_DIR="$SAGE_LOCAL"/include
    59 FLINT_NTL_LIB_DIR="$SAGE_LOCAL"/lib/
     38export FLINT_LINK_OPTIONS=""
    6039
    61 # What is QD?? possibly quad double?
    62 FLINT_QD_LIB_DIR="$SAGE_LOCAL"/include
    63 FLINT_QD_INCLUDE_DIR="$SAGE_LOCAL"/include
    64 
    65 export FLINT_GMP_INCLUDE_DIR
    66 export FLINT_GMP_LIB_DIR
    67 export FLINT_QD_INCLUDE_DIR
    68 export FLINT_QD_LIB_DIR
    69 export FLINT_NTL_INCLUDE_DIR
    70 export FLINT_NTL_LIB_DIR
    71 
    72 ###
    73 FLINT_LINK_OPTIONS=""
    74 export FLINT_LINK_OPTIONS
    7540
    7641# Apply all patches
    7742if [ $UNAME = "CYGWIN" ]; then