Ticket #13190: trac13190_root.patch

File trac13190_root.patch, 1.1 KB (added by ohanar, 9 years ago)

apply to root repo

  • spkg/bin/sage

    # HG changeset patch
    # User R. Andrew Ohana <andrew.ohana@gmail.com>
    # Date 1346883400 25200
    # Node ID bf1a43f0973edb53bf05187969b5017bb3e7fb79
    # Parent  86ecc205b3d44f9adae2526bf0deda5c3a0946f7
    switch from distutils to setuptools for Sage library
    
    diff --git a/spkg/bin/sage b/spkg/bin/sage
    a b  
    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  
    461461                 $(INST)/$(READLINE) \
    462462                 $(INST)/$(SAGE_SCRIPTS) \
    463463                 $(INST)/$(SCONS) \
     464                 $(INST)/$(SETUPTOOLS) \
    464465                 $(INST)/$(SINGULAR) \
    465466                 $(INST)/$(SYMMETRICA) \
    466467                 $(INST)/$(ZNPOLY)
     
    525526$(INST)/$(JINJA2): $(INST)/$(PYGMENTS)
    526527$(INST)/$(SPHINX): $(INST)/$(JINJA2)
    527528$(INST)/$(SAGENB): $(INST)/$(SPHINX)
     529$(INST)/$(SAGE): $(INST)/$(SAGENB)