Ticket #11503: trac-11503-jmol-spkg.patch

File trac-11503-jmol-spkg.patch, 1.2 KB (added by jdemeyer, 10 years ago)

apply to the sage root repository

  • spkg/install

    # HG changeset patch
    # User Jason Grout <jason.grout@drake.edu>
    # Date 1326780964 21600
    # Node ID 53c15079a3268a37d4a4ce65a46c956b2ed43a30
    # Parent  a39e1812c5c7967698bf04ab2cdb3e655fbea158
    Add dependencies for the new jmol spkg
    
    diff --git a/spkg/install b/spkg/install
    a b  
    231231JINJA2=`$newest jinja2`
    232232export JINJA2
    233233
     234JMOL=`$newest jmol`
     235export JMOL
     236
    234237MATPLOTLIB=`$newest matplotlib`
    235238export MATPLOTLIB
    236239
  • spkg/standard/deps

    diff --git a/spkg/standard/deps b/spkg/standard/deps
    a b  
    6969     $(INST)/$(IML) \
    7070     $(INST)/$(IPYTHON) \
    7171     $(INST)/$(JINJA2) \
     72     $(INST)/$(JMOL) \
    7273     $(INST)/$(LAPACK) \
    7374     $(INST)/$(LCALC) \
    7475     $(INST)/$(LIBGCRYPT) \
     
    339340$(INST)/$(ZLIB): $(BASE) $(INST)/$(PATCH)
    340341        +$(PIPE) "$(SAGE_SPKG) $(ZLIB) 2>&1" "tee -a $(SAGE_LOGS)/$(ZLIB).log"
    341342
     343$(INST)/$(JMOL): $(BASE) $(INST)/$(SAGENB) $(INST)/$(PATCH)
     344        +$(PIPE) "$(SAGE_SPKG) $(JMOL) 2>&1" "tee -a $(SAGE_LOGS)/$(JMOL).log"
     345
    342346##  << NON-GUI matplotlib >>
    343347$(INST)/$(FREETYPE): $(BASE) $(INST)/$(PATCH)
    344348        +$(PIPE) "$(SAGE_SPKG) $(FREETYPE) 2>&1" "tee -a $(SAGE_LOGS)/$(FREETYPE).log"