Ticket #10508: 10508_root.patch

File 10508_root.patch, 3.2 KB (added by jdemeyer, 8 years ago)
  • spkg/install

    # HG changeset patch
    # User Volker Braun <vbraun@stp.dias.ie>
    # Date 1341860397 -3600
    # Node ID 001a47383ce36600fb5ac64fbc0a8d79f45c4b1e
    # Parent  9f56ee5c8e3765950b371274140c05f9651e2100
    Remove the blas and lapack spkgs, which are provided by atlas now.
    
    diff --git a/spkg/install b/spkg/install
    a b  
    355355
    356356# Standard packages
    357357ATLAS=`newest_version atlas`
    358 BLAS=`newest_version blas`
    359358BOEHM_GC=`newest_version boehm_gc`
    360359BOOST_CROPPED=`newest_version boost_cropped`
    361360BZIP2=`newest_version bzip2`
     
    391390IPYTHON=`newest_version ipython`
    392391JINJA2=`newest_version jinja2`
    393392JMOL=`newest_version jmol`
    394 LAPACK=`newest_version lapack`
    395393LCALC=`newest_version lcalc`
    396394LRCALC=`newest_version lrcalc`
    397395LIBGAP=`newest_version libgap`
  • spkg/standard/deps

    diff --git a/spkg/standard/deps b/spkg/standard/deps
    a b  
    3131# All targets except for the base packages
    3232all-sage: \
    3333     $(INST)/$(ATLAS) \
    34      $(INST)/$(BLAS) \
    3534     $(INST)/$(BOEHM_GC) \
    3635     $(INST)/$(BOOST_CROPPED) \
    3736     $(INST)/$(CDDLIB) \
     
    6564     $(INST)/$(IPYTHON) \
    6665     $(INST)/$(JINJA2) \
    6766     $(INST)/$(JMOL) \
    68      $(INST)/$(LAPACK) \
    6967     $(INST)/$(LCALC) \
    7068     $(INST)/$(LRCALC) \
    7169     $(INST)/$(LIBGAP) \
     
    171169###############################################################################
    172170# Building normal packages
    173171###############################################################################
    174 $(INST)/$(ATLAS): $(INST)/$(LAPACK) $(INST)/$(PYTHON)
     172
     173# ATLAS depends on SAGE_ROOT_REPO because it *executes* Fortran code at
     174# build time.  Therefore, it needs an up-to-date version of sage-env
     175# which adds $SAGE_LOCAL/lib64 to the LD_LIBRARY_PATH.
     176$(INST)/$(ATLAS): $(INST)/$(PYTHON) $(INST)/$(SAGE_ROOT_REPO)
    175177        +$(PIPE) "$(SAGE_SPKG) $(ATLAS) 2>&1" "tee -a $(SAGE_LOGS)/$(ATLAS).log"
    176178
    177179$(INST)/$(BOEHM_GC):
     
    523525$(INST)/$(PIL): $(INST)/$(PYTHON)
    524526        +$(PIPE) "$(SAGE_SPKG) $(PIL) 2>&1" "tee -a $(SAGE_LOGS)/$(PIL).log"
    525527
    526 # Lapack depends on SAGE_ROOT_REPO because it *executes* Fortran code at
    527 # build time.  Therefore, it needs an up-to-date version of sage-env
    528 # which adds $SAGE_LOCAL/lib64 to the LD_LIBRARY_PATH.
    529 $(INST)/$(LAPACK): $(INST)/$(SAGE_ROOT_REPO)
    530         +$(PIPE) "$(SAGE_SPKG) $(LAPACK) 2>&1" "tee -a $(SAGE_LOGS)/$(LAPACK).log"
    531 
    532 $(INST)/$(BLAS):
    533         +$(PIPE) "$(SAGE_SPKG) $(BLAS) 2>&1" "tee -a $(SAGE_LOGS)/$(BLAS).log"
    534 
    535 $(INST)/$(NUMPY): $(INST)/$(PYTHON) \
    536                   $(INST)/$(LAPACK) $(INST)/$(BLAS) $(INST)/$(ATLAS)
     528$(INST)/$(NUMPY): $(INST)/$(PYTHON) $(INST)/$(ATLAS)
    537529        +$(PIPE) "$(SAGE_SPKG) $(NUMPY) 2>&1" "tee -a $(SAGE_LOGS)/$(NUMPY).log"
    538530
    539 $(INST)/$(SCIPY): $(INST)/$(LAPACK) $(INST)/$(BLAS) $(INST)/$(NUMPY)
     531$(INST)/$(SCIPY): $(INST)/$(ATLAS) $(INST)/$(NUMPY)
    540532        +$(PIPE) "$(SAGE_SPKG) $(SCIPY) 2>&1" "tee -a $(SAGE_LOGS)/$(SCIPY).log"
    541533
    542534# matplotlib is needed to test cvxopt (i.e., if SAGE_CHECK=yes). See #12742.
    543 $(INST)/$(CVXOPT): \
    544                    $(INST)/$(LAPACK) $(INST)/$(BLAS) $(INST)/$(NUMPY) \
     535$(INST)/$(CVXOPT): $(INST)/$(NUMPY) \
    545536                   $(INST)/$(ATLAS) $(INST)/$(CEPHES) \
    546537                   $(INST)/$(GSL) $(INST)/$(GLPK) $(INST)/$(MATPLOTLIB)
    547538        +$(PIPE) "$(SAGE_SPKG) $(CVXOPT) 2>&1" "tee -a $(SAGE_LOGS)/$(CVXOPT).log"