Ticket #14753: 14753_revert_atlas.patch

File 14753_revert_atlas.patch, 3.2 KB (added by jdemeyer, 9 years ago)
  • spkg/install

    # HG changeset patch
    # User Jeroen Demeyer <jdemeyer@cage.ugent.be>
    # Date 1371471059 -7200
    # Node ID fec999a2208679507aafc067d36da06e211b2239
    # Parent  4487315470ff211471c28307b6cab82dd57a267a
    Revert ATLAS package
    
    diff --git a/spkg/install b/spkg/install
    a b  
    372372
    373373# Standard packages
    374374ATLAS=`newest_version atlas`
     375BLAS=`newest_version blas`
    375376BOEHM_GC=`newest_version boehm_gc`
    376377BOOST_CROPPED=`newest_version boost_cropped`
    377378BZIP2=`newest_version bzip2`
     
    407408IPYTHON=`newest_version ipython`
    408409JINJA2=`newest_version jinja2`
    409410JMOL=`newest_version jmol`
     411LAPACK=`newest_version lapack`
    410412LCALC=`newest_version lcalc`
    411413LRCALC=`newest_version lrcalc`
    412414LIBGAP=`newest_version libgap`
  • spkg/standard/deps

    diff --git a/spkg/standard/deps b/spkg/standard/deps
    a b  
    3030# All targets except for the base packages
    3131all-sage: \
    3232     $(INST)/$(ATLAS) \
     33     $(INST)/$(BLAS) \
    3334     $(INST)/$(BOEHM_GC) \
    3435     $(INST)/$(BOOST_CROPPED) \
    3536     $(INST)/$(CDDLIB) \
     
    6364     $(INST)/$(IPYTHON) \
    6465     $(INST)/$(JINJA2) \
    6566     $(INST)/$(JMOL) \
     67     $(INST)/$(LAPACK) \
    6668     $(INST)/$(LCALC) \
    6769     $(INST)/$(LRCALC) \
    6870     $(INST)/$(LIBGAP) \
     
    168170###############################################################################
    169171# Building normal packages
    170172###############################################################################
    171 
    172 # ATLAS depends on SAGE_ROOT_REPO because it *executes* Fortran code at
    173 # build time.  Therefore, it needs an up-to-date version of sage-env
    174 # which adds $SAGE_LOCAL/lib64 to the LD_LIBRARY_PATH.
    175 $(INST)/$(ATLAS): $(INST)/$(PYTHON) $(INST)/$(SAGE_ROOT_REPO)
     173$(INST)/$(ATLAS): $(INST)/$(LAPACK) $(INST)/$(PYTHON)
    176174        +$(PIPE) "$(SAGE_SPKG) $(ATLAS) 2>&1" "tee -a $(SAGE_LOGS)/$(ATLAS).log"
    177175
    178176$(INST)/$(BOEHM_GC):
     
    524522$(INST)/$(PIL): $(INST)/$(PYTHON)
    525523        +$(PIPE) "$(SAGE_SPKG) $(PIL) 2>&1" "tee -a $(SAGE_LOGS)/$(PIL).log"
    526524
    527 $(INST)/$(NUMPY): $(INST)/$(PYTHON) $(INST)/$(ATLAS)
     525# Lapack depends on SAGE_ROOT_REPO because it *executes* Fortran code at
     526# build time.  Therefore, it needs an up-to-date version of sage-env
     527# which adds $SAGE_LOCAL/lib64 to the LD_LIBRARY_PATH.
     528$(INST)/$(LAPACK): $(INST)/$(SAGE_ROOT_REPO)
     529        +$(PIPE) "$(SAGE_SPKG) $(LAPACK) 2>&1" "tee -a $(SAGE_LOGS)/$(LAPACK).log"
     530
     531$(INST)/$(BLAS):
     532        +$(PIPE) "$(SAGE_SPKG) $(BLAS) 2>&1" "tee -a $(SAGE_LOGS)/$(BLAS).log"
     533
     534$(INST)/$(NUMPY): $(INST)/$(PYTHON) \
     535                  $(INST)/$(LAPACK) $(INST)/$(BLAS) $(INST)/$(ATLAS)
    528536        +$(PIPE) "$(SAGE_SPKG) $(NUMPY) 2>&1" "tee -a $(SAGE_LOGS)/$(NUMPY).log"
    529537
    530 $(INST)/$(SCIPY): $(INST)/$(ATLAS) $(INST)/$(NUMPY)
     538$(INST)/$(SCIPY): $(INST)/$(LAPACK) $(INST)/$(BLAS) $(INST)/$(NUMPY)
    531539        +$(PIPE) "$(SAGE_SPKG) $(SCIPY) 2>&1" "tee -a $(SAGE_LOGS)/$(SCIPY).log"
    532540
    533541# matplotlib is needed to test cvxopt (i.e., if SAGE_CHECK=yes). See #12742.
    534 $(INST)/$(CVXOPT): $(INST)/$(NUMPY) \
     542$(INST)/$(CVXOPT): \
     543                   $(INST)/$(LAPACK) $(INST)/$(BLAS) $(INST)/$(NUMPY) \
    535544                   $(INST)/$(ATLAS) $(INST)/$(CEPHES) \
    536545                   $(INST)/$(GSL) $(INST)/$(GLPK) $(INST)/$(MATPLOTLIB)
    537546        +$(PIPE) "$(SAGE_SPKG) $(CVXOPT) 2>&1" "tee -a $(SAGE_LOGS)/$(CVXOPT).log"