Ticket #15433: sqlite-3.7.17.p1.diff

File sqlite-3.7.17.p1.diff, 1.5 KB (added by jdemeyer, 4 years ago)
  • SPKG.txt

    # HG changeset patch
    # User R. Andrew Ohana <andrew.ohana@gmail.com>
    # Date 1385532478 28800
    # Node ID 14ca3438cd883faa05060681f0e732547f4b62ba
    # Parent  3f64e8ffcca20b7e8527a33a793b220c5f84f2b0
    Trac #15433: don't build sqlite on OS X 10.9
    
    diff --git a/SPKG.txt b/SPKG.txt
    a b  
    2323
    2424== Changelog ==
    2525
     26=== sqlite-3.7.17.p1 (R. Andrew Ohana, 11 November 2013) ===
     27 * #15433: don't build sqlite on OS X 10.9, as it can cause issues
     28   for the system libraries that link against Apple's custom
     29   version of sqlite
     30
    2631=== sqlite-3.7.17 (Jeroen Demeyer, 24 May 2013) ===
    2732 * #14629: upgrade to version 3.7.17
    2833 * Use standard template for SPKG.txt and spkg-install, use $MAKE instead of make
  • spkg-install

    diff --git a/spkg-install b/spkg-install
    a b  
    66    exit 1
    77fi
    88
     9# OS X already has sqlite3 which includes some non-standard
     10# modules to support their frameworks -- our own copy would
     11# create issues since we set *_LIBRARY_PATH
     12if { uname -sr | grep 'Darwin 1[3-9][.]' ;} &>/dev/null; then
     13    ln -s /usr/bin/sqlite3 "$SAGE_LOCAL/bin"
     14
     15    # only exit if we actually linked it, otherwise we might
     16    # break an upgrade
     17    if [ -h "$SAGE_LOCAL/bin/sqlite3" ]; then
     18        exit 0
     19    fi
     20fi
     21
    922cd src
    1023
    1124# Apply patches.  See SPKG.txt for information about what each patch
     
    1932    fi
    2033done
    2134
    22 # Compile for 64-bit if SAGE64 is set to 'yes' 
     35# Compile for 64-bit if SAGE64 is set to 'yes'
    2336if [ "x$SAGE64" = "xyes" ] ; then
    2437    CFLAGS="$CFLAGS -m64 "
    2538fi