Ticket #13898: mercurial-p1.patch

File mercurial-p1.patch, 926 bytes (added by Volker Braun, 10 years ago)

diff for review only

  • SPKG.txt

    diff -r b518c7de2f0b -r 08ad82296477 SPKG.txt
    a b  
    2828
    2929== Changelog ==
    3030
     31=== mercurial-2.2.2.p1 (Volker Braun, 1 Jan 2013) ===
     32 * Trac #13898: workaround for XCode bug
     33
    3134=== mercurial-2.2.2.p0 (Jeroen Demeyer, 28 June 2012) ===
    3235 * Trac #13175: upgrade to mercurial-2.2.2.
    3336 * Remove xcode.patch, which got upstreamed.
  • spkg-install

    diff -r b518c7de2f0b -r 08ad82296477 spkg-install
    a b  
    1717    CXXFLAGS="-O2 -g $CXXFLAGS $CFLAG64"; export CXXFLAGS
    1818fi
    1919
     20# Workaround for XCode bug (apparently only some versions)
     21# see http://trac.sagemath.org/13898
     22if [ $UNAME = "Darwin" ]; then
     23    CFLAGS="$CFLAGS -DOS_OBJECT_USE_OBJC=0"
     24fi
     25
    2026# Remove existing copies of Mercurial:
    2127rm -rf "$SAGE_LOCAL/lib/python/mercurial"
    2228