# 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
|
|
372 | 372 | |
373 | 373 | # Standard packages |
374 | 374 | ATLAS=`newest_version atlas` |
| 375 | BLAS=`newest_version blas` |
375 | 376 | BOEHM_GC=`newest_version boehm_gc` |
376 | 377 | BOOST_CROPPED=`newest_version boost_cropped` |
377 | 378 | BZIP2=`newest_version bzip2` |
… |
… |
|
407 | 408 | IPYTHON=`newest_version ipython` |
408 | 409 | JINJA2=`newest_version jinja2` |
409 | 410 | JMOL=`newest_version jmol` |
| 411 | LAPACK=`newest_version lapack` |
410 | 412 | LCALC=`newest_version lcalc` |
411 | 413 | LRCALC=`newest_version lrcalc` |
412 | 414 | LIBGAP=`newest_version libgap` |
diff --git a/spkg/standard/deps b/spkg/standard/deps
a
|
b
|
|
30 | 30 | # All targets except for the base packages |
31 | 31 | all-sage: \ |
32 | 32 | $(INST)/$(ATLAS) \ |
| 33 | $(INST)/$(BLAS) \ |
33 | 34 | $(INST)/$(BOEHM_GC) \ |
34 | 35 | $(INST)/$(BOOST_CROPPED) \ |
35 | 36 | $(INST)/$(CDDLIB) \ |
… |
… |
|
63 | 64 | $(INST)/$(IPYTHON) \ |
64 | 65 | $(INST)/$(JINJA2) \ |
65 | 66 | $(INST)/$(JMOL) \ |
| 67 | $(INST)/$(LAPACK) \ |
66 | 68 | $(INST)/$(LCALC) \ |
67 | 69 | $(INST)/$(LRCALC) \ |
68 | 70 | $(INST)/$(LIBGAP) \ |
… |
… |
|
168 | 170 | ############################################################################### |
169 | 171 | # Building normal packages |
170 | 172 | ############################################################################### |
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) |
176 | 174 | +$(PIPE) "$(SAGE_SPKG) $(ATLAS) 2>&1" "tee -a $(SAGE_LOGS)/$(ATLAS).log" |
177 | 175 | |
178 | 176 | $(INST)/$(BOEHM_GC): |
… |
… |
|
524 | 522 | $(INST)/$(PIL): $(INST)/$(PYTHON) |
525 | 523 | +$(PIPE) "$(SAGE_SPKG) $(PIL) 2>&1" "tee -a $(SAGE_LOGS)/$(PIL).log" |
526 | 524 | |
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) |
528 | 536 | +$(PIPE) "$(SAGE_SPKG) $(NUMPY) 2>&1" "tee -a $(SAGE_LOGS)/$(NUMPY).log" |
529 | 537 | |
530 | | $(INST)/$(SCIPY): $(INST)/$(ATLAS) $(INST)/$(NUMPY) |
| 538 | $(INST)/$(SCIPY): $(INST)/$(LAPACK) $(INST)/$(BLAS) $(INST)/$(NUMPY) |
531 | 539 | +$(PIPE) "$(SAGE_SPKG) $(SCIPY) 2>&1" "tee -a $(SAGE_LOGS)/$(SCIPY).log" |
532 | 540 | |
533 | 541 | # 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) \ |
535 | 544 | $(INST)/$(ATLAS) $(INST)/$(CEPHES) \ |
536 | 545 | $(INST)/$(GSL) $(INST)/$(GLPK) $(INST)/$(MATPLOTLIB) |
537 | 546 | +$(PIPE) "$(SAGE_SPKG) $(CVXOPT) 2>&1" "tee -a $(SAGE_LOGS)/$(CVXOPT).log" |