Ticket #12173: flint-2.3.p1.diff

File flint-2.3.p1.diff, 2.3 KB (added by jdemeyer, 9 years ago)

Diff flint-2.3 -> flint-2.3.p1

  • SPKG.txt

    # HG changeset patch
    # User Jean-Pierre Flori <jean-pierre.flori@ssi.gouv.fr>
    # Date 1367853138 -3600
    # Node ID c79694d03b4fba67946d00cf15177180d344ce41
    # Parent  63675866eb180215e180bb6d5732ecdb5edf2c4f
    #12173: fixes for OS X 10.4
    
    diff --git a/SPKG.txt b/SPKG.txt
    a b  
    3030
    3131 * dylib.patch: patch configure so that the shared library is called
    3232   libflint.dylib on Darwin.
     33 * cflags.patch: patch configure so that "-m64" (and other potentially
     34   unwanted cflags) is not added on PowerPC G5. Also add -fno-common
     35   on Darwin, which is needed for OS X 10.4 and doesn't hurt on other
     36   systems.
    3337
    3438== Changelog ==
    3539
    36 === flint-2.3.p0 (Jean-Pierre Flori, 26 March 2013) ===
    37   * Trac #12173: add dylib.patch to make sure the shared library is called
    38     libflint.dylib on Darwin
     40=== flint-2.3.p1 (Jean-Pierre Flori, 8 May 2013) ===
     41  * Trac #12173: add dylib.patch and cflags.patch
    3942
    4043=== flint-2.3 (Mike Hansen, Fredrik Johansson, Jean-Pierre Flori, May 2012-March 2013) ===
    4144  * Trac #12173: Update FLINT to version 2.3.
  • new file patches/cflags.patch

    diff --git a/patches/cflags.patch b/patches/cflags.patch
    new file mode 100644
    - +  
     1diff -ru src/configure b/configure
     2--- src/configure       2012-11-09 21:42:47.000000000 +0100
     3+++ b/configure 2013-05-08 12:12:08.233238871 +0200
     4@@ -262,13 +262,7 @@
     5 #various tuning parameters
     6 
     7 if [ -z "$FLINT_TUNE" ]; then
     8-   if [ "$KERNEL" = "Linux" -a "$ARCH" = "x86_64" ]; then
     9-      FLINT_TUNE="-funroll-loops"
     10-   elif [ "$KERNEL" = "Darwin" -a "$ARCH" = "ppc" ]; then
     11-      FLINT_TUNE=" -funroll-loops"
     12-   elif [ "`uname -p`" = "powerpc" ]; then
     13-      FLINT_TUNE="-m64 -mcpu=970 -mtune=970 -mpowerpc64 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16"
     14-   elif [ "$ARCH" = "ia64" ]; then
     15+   if [ "$ARCH" = "ia64" ]; then
     16       # -funroll-loops crashes the build on itanium under GCC-4.2.1, as reported by
     17       # Kate Minola.
     18       FLINT_TUNE=""
     19@@ -325,6 +319,11 @@
     20    CFLAGS="-O2 -g -ansi -pedantic -Wall $POPCNT_FLAG $ABI_FLAG"
     21 fi
     22 
     23+# Old Darwin versions (OS X 10.4) require -fno-common
     24+if [ "$KERNEL" = Darwin ]; then
     25+   CFLAGS="-fno-common $CFLAGS"
     26+fi
     27+
     28 #add tuning parameters to CFLAGS
     29 
     30 CFLAGS="$CFLAGS $FLINT_TUNE"