Ticket #13201: trac13201.patch

File trac13201.patch, 1.5 KB (added by ohanar, 10 years ago)

apply to root repo

  • spkg/bin/sage

    # HG changeset patch
    # User R. Andrew Ohana <andrew.ohana@gmail.com>
    # Date 1346930516 25200
    # Node ID ef0d3456543abe34cd26e5af3c45432cbba92ec7
    # Parent  86ecc205b3d44f9adae2526bf0deda5c3a0946f7
    remove serialization for spkgs using setuptools
    
    diff --git a/spkg/bin/sage b/spkg/bin/sage
    a b  
    293293
    294294    # Check to see if the whole Sage install tree has moved.
    295295    # If so, change various hardcoded paths.
    296     "$SAGE_ROOT/local/bin/"sage-location
     296    "$SAGE_LOCAL/bin/"sage-location
    297297    if [ $? -ne 0 ]; then
    298298        exit 1
    299299    fi
     300    # Hack around setuptools since --egg-path isn't fully respected
     301    sed -i 's-.*sagenb.*-\.\./\.\./\.\./\.\./devel/sagenb-' \
     302        "$SAGE_LOCAL/lib/python/site-packages/easy-install.pth"
    300303
    301304    cd "$SAGE_ROOT/local/bin"
    302305    IPYTHONDIR="$DOT_SAGE/ipython" && export IPYTHONDIR
  • spkg/standard/deps

    diff --git a/spkg/standard/deps b/spkg/standard/deps
    a b  
    516516        +$(PIPE) "$(SAGE_SPKG) $(CEPHES) 2>&1" "tee -a $(SAGE_LOGS)/$(CEPHES).log"
    517517
    518518###############################################################################
    519 
    520 # setuptools forgets to update easy-install.pth during parallel
    521 # builds, so we build the relevant packages serially.
    522 
    523 $(INST)/$(SQLALCHEMY): $(INST)/$(ZODB)
    524 $(INST)/$(PYGMENTS): $(INST)/$(SQLALCHEMY)
    525 $(INST)/$(JINJA2): $(INST)/$(PYGMENTS)
    526 $(INST)/$(SPHINX): $(INST)/$(JINJA2)
    527 $(INST)/$(SAGENB): $(INST)/$(SPHINX)