Attachment #142616 for bug #201321

View | Details | Raw Unified | Return to bug 201321 | Differences between

and this patch




########################################
# The base system; required in order to run spkg
########################################
BASE    = $(INST)/$(PREREQ) $(INST)/$(DIR)

all: $(INST)/$(SAGE_SCRIPTS) $(INST)/$(SAGE) $(INST)/$(DOC)  \
     $(INST)/$(EXAMPLES) $(INST)/$(GAP) $(INST)/$(SINGULAR) \
     $(INST)/$(G2RED) $(INST)/$(LCALC) $(INST)/$(SYMPOW) $(INST)/$(MATPLOTLIB) \
     $(INST)/$(GFAN) $(INST)/$(ECM) $(INST)/$(TACHYON)  \
     $(INST)/$(GIVARO) $(INST)/$(LINBOX) $(INST)/$(IML) \
     $(INST)/$(SYMMETRICA) $(INST)/$(POLYBORI) \
     $(INST)/$(GDMODULE) \
     $(INST)/$(MERCURIAL) $(INST)/$(TWISTED) $(INST)/$(TWISTEDWEB2) \
     $(INST)/$(NUMPY) $(INST)/$(WEAVE)  $(INST)/$(FLINTQS) $(INST)/$(FLINT) $(INST)/$(PYCRYPTO) \
     $(INST)/$(PALP) $(INST)/$(MOIN)  \
     $(INST)/$(IPYTHON1)  \
     $(INST)/$(PYTHON_GNUTLS) \
     $(INST)/$(SCIPY) $(INST)/$(SCIPY_SANDBOX) \
     $(INST)/$(CVXOPT) \
     $(INST)/$(SCONS) \
     $(INST)/$(JMOL) \
     $(INST)/$(R) $(INST)/$(RUBIKS)

base: $(BASE)


$(INST)/$(PREREQ): $(INST)/$(DIR)
	base/$(PREREQ)-install

$(INST)/$(SAGE_BZIP2): $(INST)/$(PREREQ) $(INST)/$(DIR)
	base/$(SAGE_BZIP2)-install 2>&1 

########################################
# Building normal packages
########################################

$(INST)/$(ATLAS): $(BASE) $(INST)/$(LAPACK) $(INST)/$(PYTHON)
	$(SAGE_SPKG) $(ATLAS) 2>&1

$(INST)/$(TERMCAP): $(BASE)
	$(SAGE_SPKG) $(TERMCAP) 2>&1

$(INST)/$(READLINE): $(BASE)
	$(SAGE_SPKG) $(READLINE) 2>&1

$(INST)/$(ELLIPTIC_CURVES): $(BASE)
	$(SAGE_SPKG) $(ELLIPTIC_CURVES) 2>&1


$(INST)/$(GRAPHS): $(BASE)
	$(SAGE_SPKG) $(GRAPHS) 2>&1

$(INST)/$(PYTHON): $(BASE) $(INST)/$(TERMCAP)
	$(SAGE_SPKG) $(PYTHON) 2>&1

$(INST)/$(GMP): $(BASE) 
	$(SAGE_SPKG) $(GMP) 2>&1

$(INST)/$(GSL): $(BASE) $(INST)/$(ATLAS)
	$(SAGE_SPKG) $(GSL) 2>&1

#$(INST)/$(FLEX): $(BASE) 
#	$(SAGE_SPKG) $(FLEX) 2>&1


$(INST)/$(FPLLL): $(BASE) $(INST)/$(GMP) $(INST)/$(MPFR)
	$(SAGE_SPKG) $(FPLLL) 2 >&1

$(INST)/$(PARI): $(BASE) $(INST)/$(TERMCAP) $(INST)/$(GMP)
	$(SAGE_SPKG) $(PARI) 2>&1

$(INST)/$(POLYBORI): $(BASE) $(INST)/$(PYTHON) $(INST)/$(SCONS)

$(INST)/$(GIVARO): $(BASE) $(INST)/$(GMP)
	$(SAGE_SPKG) $(GIVARO) 2>&1

$(INST)/$(LINBOX): $(BASE) $(INST)/$(GMP) $(INST)/$(NTL) $(INST)/$(GIVARO)
	$(SAGE_SPKG) $(LINBOX) 2>&1
$(INST)/$(LINBOX): LINBOX_BLAS = yes
   export LINBOX_BLAS

$(INST)/$(IML): $(BASE) $(INST)/$(GMP) 
	$(SAGE_SPKG) $(IML) 2>&1

$(INST)/$(ECLIB): $(BASE) $(INST)/$(GMP) $(INST)/$(PARI) $(INST)/$(NTL)

	$(SAGE_SPKG) $(SYMMETRICA) 2>&1

# gap requires SAGE so that gap_reset_workspace works.
$(INST)/$(GAP): $(BASE)  $(INST)/$(GMP) $(INST)/$(TERMCAP) $(INST)/$(SAGE)
	$(SAGE_SPKG) $(GAP) 2>&1

$(INST)/$(IPYTHON): $(INST)/$(PYTHON) 

$(INST)/$(PEXPECT): $(INST)/$(PYTHON) 
	$(SAGE_SPKG) $(PEXPECT) 2>&1

$(INST)/$(GD): $(INST)/$(LIBPNG) $(INST)/$(FREETYPE) 
	$(SAGE_SPKG) $(GD) 2>&1

#$(INST)/$(DVIPNG): $(INST)/$(LIBPNG) $(INST)/$(FREETYPE) 
#	$(SAGE_SPKG) $(DVIPNG) 2>&1

$(INST)/$(GDMODULE): $(INST)/$(PYTHON) 
	$(SAGE_SPKG) $(GDMODULE) 2>&1

$(INST)/$(TWISTED): $(INST)/$(PYTHON) $(INST)/$(PYTHON_GNUTLS)

$(INST)/$(TWISTEDWEB2): $(INST)/$(TWISTED)
	$(SAGE_SPKG) $(TWISTEDWEB2) 2>&1

$(INST)/$(PYTHON_GNUTLS):  $(INST)/$(PYTHON)
	$(SAGE_SPKG) $(OPENCDK) 2>&1

$(INST)/$(LIBGPG_ERROR):  
	$(SAGE_SPKG) $(LIBGPG_ERROR) 2>&1

$(INST)/$(LIBGCRYPT):  $(INST)/$(LIBGPG_ERROR)
	$(SAGE_SPKG) $(LIBGCRYPT) 2>&1

$(INST)/$(GNUTLS):  $(INST)/$(ZLIB) $(INST)/$(OPENCDK) $(INST)/$(LIBGCRYPT) $(INST)/$(LIBGPG_ERROR)
	$(SAGE_SPKG) $(GNUTLS) 2>&1

$(INST)/$(PYTHON_GNUTLS):  $(INST)/$(GNUTLS) $(INST)/$(PYTHON)
	$(SAGE_SPKG) $(PYTHON_GNUTLS) 2>&1

$(INST)/$(SCONS):  $(INST)/$(PYTHON)

$(INST)/$(MOIN): $(INST)/$(PYTHON) $(INST)/$(TWISTED) $(INST)/$(EXTCODE)
	$(SAGE_SPKG) $(MOIN) 2>&1

$(INST)/$(SQLITE): $(INST)/$(TERMCAP) $(INST)/$(READLINE)
	$(SAGE_SPKG) $(SQLITE) 2>&1

$(INST)/$(MERCURIAL): $(INST)/$(PYTHON) 
	$(SAGE_SPKG) $(MERCURIAL) 2>&1
	$(MAKEREL)

$(INST)/$(SINGULAR): $(BASE) $(INST)/$(GMP) $(INST)/$(NTL) $(INST)/$(TERMCAP) $(INST)/$(MPFR)
	$(SAGE_SPKG) $(SINGULAR) 2>&1

$(INST)/$(PYCRYPTO): $(BASE) $(INST)/$(PYTHON)

#$(INST)/$(GNUPLOT): $(BASE) $(INST)/$(TERMCAP) $(INST)/$(READLINE) $(INST)/$(LIBPNG)
#	$(SAGE_SPKG) $(GNUPLOT) 2>&1

$(INST)/$(ZLIB): $(BASE) 
	$(SAGE_SPKG) $(ZLIB) 2>&1

#$(INST)/$(GNUPLOTPY): $(BASE) $(INST)/$(PYTHON) $(INST)/$(NUMPY)
#	$(SAGE_SPKG) $(GNUPLOTPY) 2>&1


##  << NON-GUI matplotlib >>

$(INST)/$(MATPLOTLIB): $(BASE) $(INST)/$(PYTHON) $(INST)/$(NUMPY) $(INST)/$(GDMODULE)
	$(SAGE_SPKG) $(FREETYPE) 2>&1

$(INST)/$(LIBPNG): $(BASE)
	$(SAGE_SPKG) $(LIBPNG) 2>&1

$(INST)/$(MATPLOTLIB): $(BASE) $(INST)/$(PYTHON) $(INST)/$(NUMPY) $(INST)/$(FREETYPE) $(INST)/$(LIBPNG) $(INST)/$(GDMODULE)
	$(SAGE_SPKG) $(MATPLOTLIB) 2>&1



$(INST)/$(GFAN): $(BASE) $(INST)/$(GMP) $(INST)/$(CDDLIB)
	$(SAGE_SPKG) $(GFAN) 2>&1

$(INST)/$(TACHYON): $(BASE)
	$(SAGE_SPKG) $(TACHYON) 2>&1

$(INST)/$(ECM): $(BASE) $(INST)/$(GMP)

#$(INST)/$(LIBSIGSEGV): $(BASE)
#	$(SAGE_SPKG) $(LIBSIGSEGV) 2>&1

$(INST)/$(CLISP): $(BASE) $(INST)/$(GMP) $(INST)/$(TERMCAP) $(INST)/$(READLINE)
	$(SAGE_SPKG) $(CLISP) 2>&1

$(INST)/$(MAXIMA): $(BASE) $(INST)/$(CLISP)
	$(SAGE_SPKG) $(MAXIMA) 2>&1

$(INST)/$(ZODB): $(INST)/$(PYTHON)
	$(SAGE_SPKG) $(ZODB) 2>&1
	$(MAKEREL)

$(INST)/$(R): $(INST)/$(PYTHON)
	$(SAGE_SPKG) $(R) 2>&1
	$(MAKEREL)


		  $(INST)/$(NUMPY) \
		  $(INST)/$(NETWORKX) \
                  $(INST)/$(GIVARO) \
                  $(INST)/$(GSL) \
                  $(INST)/$(QUADDOUBLE) \
		  $(INST)/$(GNUCRYPTOLIB) \
                  $(INST)/$(SINGULAR) \

		  $(INST)/$(FPLLL) \
		  $(INST)/$(POLYBORI) \
		  $(INST)/$(R)  \
		  $(INST)/$(ATLAS) \
		  $(INST)/$(RUBIKS) \
	          $(INST)/$(LIBM4RI) \
		  $(INST)/$(ECM)

$(INST)/$(DOC):  $(INST)/$(SAGE) 
	$(SAGE_SPKG) $(DOC)

$(INST)/$(FORTRAN):
	$(SAGE_SPKG) $(FORTRAN) 2>&1

$(INST)/$(JMOL):
	$(SAGE_SPKG) $(JMOL) 2>&1

$(INST)/$(F2C):
	$(SAGE_SPKG) $(INST)/$(F2C) 2>&1 

$(INST)/$(NUMPY): $(BASE) $(INST)/$(PYTHON) $(INST)/$(F2C)
	$(SAGE_SPKG) $(INST)/$(LAPACK) 2>&1 

$(INST)/$(BLAS): $(INST)/$(FORTRAN)
	$(SAGE_SPKG) $(INST)/$(BLAS) 2>&1 

$(INST)/$(NUMPY): $(BASE) $(INST)/$(PYTHON) $(INST)/$(FORTRAN) $(INST)/$(F2C) $(INST)/$(LAPACK) $(INST)/$(BLAS) $(INST)/$(ATLAS)
	$(SAGE_SPKG) $(NUMPY) 2>&1
$(INST)/$(NUMPY): ATLAS=/usr/lib/libblas.so
   BLAS=/usr/lib/libblas.so
   LAPACK=/usr/lib/liblapack.so
   export ATLAS BLAS LAPACK

$(INST)/$(SCIPY): $(INST)/$(F2C) $(INST)/$(NUMPY)
	$(SAGE_SPKG) $(SCIPY) 2>&1

$(INST)/$(SCIPY_SANDBOX): $(INST)/$(SCIPY)
	$(SAGE_SPKG) $(SCIPY_SANDBOX) 2>&1

$(INST)/$(CVXOPT): $(INST)/$(F2C) $(INST)/$(NUMPY)
	$(SAGE_SPKG) $(CVXOPT) 2>&1

Lines 129-134 Link Here

(-)spkg/base/prereq-0.3-install.orig (+2 lines)
129	exit 1	129	exit 1
130	else	130	else
131	echo " All prerequisites appear to be present."	131	echo " All prerequisites appear to be present."
		132	cp $ROOT/base/which_fortran $LOCAL/bin/which_fortran
		133	cp $ROOT/base/sage_fortran $LOCAL/bin/sage_fortran
132	touch $ROOT/installed/$TARGET	134	touch $ROOT/installed/$TARGET
133	fi	135	fi
134		136

Return to bug 201321

Lines 5-29 Link Here

(-)spkg/standard/deps.orig (-76 / +26 lines)
5	########################################	5	########################################
6	# The base system; required in order to run spkg	6	# The base system; required in order to run spkg
7	########################################	7	########################################
8	BASE = $(INST)/$(PREREQ) $(INST)/$(DIR) $(INST)/$(SAGE_BZIP2)	8	BASE = $(INST)/$(PREREQ) $(INST)/$(DIR)
9		9
10	all: $(INST)/$(SAGE_SCRIPTS) $(INST)/$(SAGE) $(INST)/$(DOC) \	10	all: $(INST)/$(SAGE_SCRIPTS) $(INST)/$(SAGE) $(INST)/$(DOC) \
11	$(INST)/$(EXAMPLES) $(INST)/$(GAP) $(INST)/$(SINGULAR) $(INST)/$(MAXIMA) \	11	$(INST)/$(EXAMPLES) $(INST)/$(GAP) $(INST)/$(SINGULAR) \
12	$(INST)/$(G2RED) $(INST)/$(LCALC) $(INST)/$(SYMPOW) $(INST)/$(MATPLOTLIB) \	12	$(INST)/$(G2RED) $(INST)/$(LCALC) $(INST)/$(SYMPOW) $(INST)/$(MATPLOTLIB) \
13	$(INST)/$(GFAN) $(INST)/$(ECM) $(INST)/$(TACHYON) \	13	$(INST)/$(GFAN) $(INST)/$(ECM) $(INST)/$(TACHYON) \
14	$(INST)/$(GIVARO) $(INST)/$(LINBOX) $(INST)/$(IML) \	14	$(INST)/$(GIVARO) $(INST)/$(LINBOX) $(INST)/$(IML) \
15	$(INST)/$(SYMMETRICA) $(INST)/$(POLYBORI) \	15	$(INST)/$(SYMMETRICA) $(INST)/$(POLYBORI) \
16	$(INST)/$(GSL) $(INST)/$(GD) $(INST)/$(GDMODULE) \	16	$(INST)/$(GDMODULE) \
17	$(INST)/$(MERCURIAL) $(INST)/$(TWISTED) $(INST)/$(TWISTEDWEB2) \	17	$(INST)/$(MERCURIAL) $(INST)/$(TWISTED) $(INST)/$(TWISTEDWEB2) \
18	$(INST)/$(NUMPY) $(INST)/$(WEAVE) $(INST)/$(FLINTQS) $(INST)/$(FLINT) $(INST)/$(PYCRYPTO) \	18	$(INST)/$(NUMPY) $(INST)/$(WEAVE) $(INST)/$(FLINTQS) $(INST)/$(FLINT) $(INST)/$(PYCRYPTO) \
19	$(INST)/$(PALP) $(INST)/$(MOIN) \	19	$(INST)/$(PALP) $(INST)/$(MOIN) \
20	$(INST)/$(SQLITE) $(INST)/$(IPYTHON1) \	20	$(INST)/$(IPYTHON1) \
21	$(INST)/$(PYTHON_GNUTLS) \	21	$(INST)/$(PYTHON_GNUTLS) \
22	$(INST)/$(SCIPY) $(INST)/$(SCIPY_SANDBOX) \	22	$(INST)/$(SCIPY) $(INST)/$(SCIPY_SANDBOX) \
23	$(INST)/$(CVXOPT) \	23	$(INST)/$(CVXOPT) \
24	$(INST)/$(SCONS) \	24	$(INST)/$(SCONS) \
25	$(INST)/$(JMOL) \	25	$(INST)/$(JMOL) \
26	$(INST)/$(R) $(INST)/$(ATLAS) $(INST)/$(RUBIKS)	26	$(INST)/$(R) $(INST)/$(RUBIKS)
27		27
28	base: $(BASE)	28	base: $(BASE)
29		29
Lines 38-59 Link Here
38	$(INST)/$(PREREQ): $(INST)/$(DIR)	38	$(INST)/$(PREREQ): $(INST)/$(DIR)
39	base/$(PREREQ)-install	39	base/$(PREREQ)-install
40		40
41	$(INST)/$(SAGE_BZIP2): $(INST)/$(PREREQ) $(INST)/$(DIR)
42	base/$(SAGE_BZIP2)-install 2>&1
43
44	########################################	41	########################################
45	# Building normal packages	42	# Building normal packages
46	########################################	43	########################################
47		44
48	$(INST)/$(ATLAS): $(BASE) $(INST)/$(LAPACK) $(INST)/$(PYTHON)
49	$(SAGE_SPKG) $(ATLAS) 2>&1
50
51	$(INST)/$(TERMCAP): $(BASE)	45	$(INST)/$(TERMCAP): $(BASE)
52	$(SAGE_SPKG) $(TERMCAP) 2>&1	46	$(SAGE_SPKG) $(TERMCAP) 2>&1
53		47
54	$(INST)/$(READLINE): $(BASE)
55	$(SAGE_SPKG) $(READLINE) 2>&1
56
57	$(INST)/$(ELLIPTIC_CURVES): $(BASE)	48	$(INST)/$(ELLIPTIC_CURVES): $(BASE)
58	$(SAGE_SPKG) $(ELLIPTIC_CURVES) 2>&1	49	$(SAGE_SPKG) $(ELLIPTIC_CURVES) 2>&1
59		50
Lines 63-77 Link Here
63	$(INST)/$(GRAPHS): $(BASE)	54	$(INST)/$(GRAPHS): $(BASE)
64	$(SAGE_SPKG) $(GRAPHS) 2>&1	55	$(SAGE_SPKG) $(GRAPHS) 2>&1
65		56
66	$(INST)/$(PYTHON): $(BASE) $(INST)/$(ZLIB) $(INST)/$(TERMCAP) $(INST)/$(READLINE) $(INST)/$(SQLITE) $(INST)/$(GNUTLS) $(INST)/$(LIBPNG)	57	$(INST)/$(PYTHON): $(BASE) $(INST)/$(TERMCAP)
67	$(SAGE_SPKG) $(PYTHON) 2>&1	58	$(SAGE_SPKG) $(PYTHON) 2>&1
68		59
69	$(INST)/$(GMP): $(BASE)	60	$(INST)/$(GMP): $(BASE)
70	$(SAGE_SPKG) $(GMP) 2>&1	61	$(SAGE_SPKG) $(GMP) 2>&1
71		62
72	$(INST)/$(GSL): $(BASE) $(INST)/$(ATLAS)
73	$(SAGE_SPKG) $(GSL) 2>&1
74
75	#$(INST)/$(FLEX): $(BASE)	63	#$(INST)/$(FLEX): $(BASE)
76	# $(SAGE_SPKG) $(FLEX) 2>&1	64	# $(SAGE_SPKG) $(FLEX) 2>&1
77		65
Lines 84-90 Link Here
84	$(INST)/$(FPLLL): $(BASE) $(INST)/$(GMP) $(INST)/$(MPFR)	72	$(INST)/$(FPLLL): $(BASE) $(INST)/$(GMP) $(INST)/$(MPFR)
85	$(SAGE_SPKG) $(FPLLL) 2 >&1	73	$(SAGE_SPKG) $(FPLLL) 2 >&1
86		74
87	$(INST)/$(PARI): $(BASE) $(INST)/$(TERMCAP) $(INST)/$(READLINE) $(INST)/$(GMP)	75	$(INST)/$(PARI): $(BASE) $(INST)/$(TERMCAP) $(INST)/$(GMP)
88	$(SAGE_SPKG) $(PARI) 2>&1	76	$(SAGE_SPKG) $(PARI) 2>&1
89		77
90	$(INST)/$(POLYBORI): $(BASE) $(INST)/$(PYTHON) $(INST)/$(SCONS)	78	$(INST)/$(POLYBORI): $(BASE) $(INST)/$(PYTHON) $(INST)/$(SCONS)
Lines 102-111 Link Here
102	$(INST)/$(GIVARO): $(BASE) $(INST)/$(GMP)	90	$(INST)/$(GIVARO): $(BASE) $(INST)/$(GMP)
103	$(SAGE_SPKG) $(GIVARO) 2>&1	91	$(SAGE_SPKG) $(GIVARO) 2>&1
104		92
105	$(INST)/$(LINBOX): $(BASE) $(INST)/$(GMP) $(INST)/$(NTL) $(INST)/$(GIVARO) $(INST)/$(GSL) $(INST)/$(ATLAS)	93	$(INST)/$(LINBOX): $(BASE) $(INST)/$(GMP) $(INST)/$(NTL) $(INST)/$(GIVARO)
106	$(SAGE_SPKG) $(LINBOX) 2>&1	94	$(SAGE_SPKG) $(LINBOX) 2>&1
		95	$(INST)/$(LINBOX): LINBOX_BLAS = yes
		96	export LINBOX_BLAS
107		97
108	$(INST)/$(IML): $(BASE) $(INST)/$(GMP) $(INST)/$(GSL)	98	$(INST)/$(IML): $(BASE) $(INST)/$(GMP)
109	$(SAGE_SPKG) $(IML) 2>&1	99	$(SAGE_SPKG) $(IML) 2>&1
110		100
111	$(INST)/$(ECLIB): $(BASE) $(INST)/$(GMP) $(INST)/$(PARI) $(INST)/$(NTL)	101	$(INST)/$(ECLIB): $(BASE) $(INST)/$(GMP) $(INST)/$(PARI) $(INST)/$(NTL)
Lines 127-133 Link Here
127	$(SAGE_SPKG) $(SYMMETRICA) 2>&1	117	$(SAGE_SPKG) $(SYMMETRICA) 2>&1
128		118
129	# gap requires SAGE so that gap_reset_workspace works.	119	# gap requires SAGE so that gap_reset_workspace works.
130	$(INST)/$(GAP): $(BASE) $(INST)/$(GMP) $(INST)/$(TERMCAP) $(INST)/$(READLINE) $(INST)/$(SAGE)	120	$(INST)/$(GAP): $(BASE) $(INST)/$(GMP) $(INST)/$(TERMCAP) $(INST)/$(SAGE)
131	$(SAGE_SPKG) $(GAP) 2>&1	121	$(SAGE_SPKG) $(GAP) 2>&1
132		122
133	$(INST)/$(IPYTHON): $(INST)/$(PYTHON)	123	$(INST)/$(IPYTHON): $(INST)/$(PYTHON)
Lines 141-153 Link Here
141	$(INST)/$(PEXPECT): $(INST)/$(PYTHON)	131	$(INST)/$(PEXPECT): $(INST)/$(PYTHON)
142	$(SAGE_SPKG) $(PEXPECT) 2>&1	132	$(SAGE_SPKG) $(PEXPECT) 2>&1
143		133
144	$(INST)/$(GD): $(INST)/$(LIBPNG) $(INST)/$(FREETYPE)
145	$(SAGE_SPKG) $(GD) 2>&1
146
147	#$(INST)/$(DVIPNG): $(INST)/$(LIBPNG) $(INST)/$(FREETYPE)	134	#$(INST)/$(DVIPNG): $(INST)/$(LIBPNG) $(INST)/$(FREETYPE)
148	# $(SAGE_SPKG) $(DVIPNG) 2>&1	135	# $(SAGE_SPKG) $(DVIPNG) 2>&1
149		136
150	$(INST)/$(GDMODULE): $(INST)/$(PYTHON) $(INST)/$(GD)	137	$(INST)/$(GDMODULE): $(INST)/$(PYTHON)
151	$(SAGE_SPKG) $(GDMODULE) 2>&1	138	$(SAGE_SPKG) $(GDMODULE) 2>&1
152		139
153	$(INST)/$(TWISTED): $(INST)/$(PYTHON) $(INST)/$(PYTHON_GNUTLS)	140	$(INST)/$(TWISTED): $(INST)/$(PYTHON) $(INST)/$(PYTHON_GNUTLS)
Lines 156-174 Link Here
156	$(INST)/$(TWISTEDWEB2): $(INST)/$(TWISTED)	143	$(INST)/$(TWISTEDWEB2): $(INST)/$(TWISTED)
157	$(SAGE_SPKG) $(TWISTEDWEB2) 2>&1	144	$(SAGE_SPKG) $(TWISTEDWEB2) 2>&1
158		145
159	$(INST)/$(OPENCDK): $(INST)/$(ZLIB) $(INST)/$(LIBGCRYPT)	146	$(INST)/$(PYTHON_GNUTLS): $(INST)/$(PYTHON)
160	$(SAGE_SPKG) $(OPENCDK) 2>&1
161
162	$(INST)/$(LIBGPG_ERROR):
163	$(SAGE_SPKG) $(LIBGPG_ERROR) 2>&1
164
165	$(INST)/$(LIBGCRYPT): $(INST)/$(LIBGPG_ERROR)
166	$(SAGE_SPKG) $(LIBGCRYPT) 2>&1
167
168	$(INST)/$(GNUTLS): $(INST)/$(ZLIB) $(INST)/$(OPENCDK) $(INST)/$(LIBGCRYPT) $(INST)/$(LIBGPG_ERROR)
169	$(SAGE_SPKG) $(GNUTLS) 2>&1
170
171	$(INST)/$(PYTHON_GNUTLS): $(INST)/$(GNUTLS) $(INST)/$(PYTHON)
172	$(SAGE_SPKG) $(PYTHON_GNUTLS) 2>&1	147	$(SAGE_SPKG) $(PYTHON_GNUTLS) 2>&1
173		148
174	$(INST)/$(SCONS): $(INST)/$(PYTHON)	149	$(INST)/$(SCONS): $(INST)/$(PYTHON)
Lines 187-200 Link Here
187	$(INST)/$(MOIN): $(INST)/$(PYTHON) $(INST)/$(TWISTED) $(INST)/$(EXTCODE)	162	$(INST)/$(MOIN): $(INST)/$(PYTHON) $(INST)/$(TWISTED) $(INST)/$(EXTCODE)
188	$(SAGE_SPKG) $(MOIN) 2>&1	163	$(SAGE_SPKG) $(MOIN) 2>&1
189		164
190	$(INST)/$(SQLITE): $(INST)/$(TERMCAP) $(INST)/$(READLINE)
191	$(SAGE_SPKG) $(SQLITE) 2>&1
192
193	$(INST)/$(MERCURIAL): $(INST)/$(PYTHON)	165	$(INST)/$(MERCURIAL): $(INST)/$(PYTHON)
194	$(SAGE_SPKG) $(MERCURIAL) 2>&1	166	$(SAGE_SPKG) $(MERCURIAL) 2>&1
195	$(MAKEREL)	167	$(MAKEREL)
196		168
197	$(INST)/$(SINGULAR): $(BASE) $(INST)/$(GMP) $(INST)/$(NTL) $(INST)/$(TERMCAP) $(INST)/$(READLINE) $(INST)/$(MPFR)	169	$(INST)/$(SINGULAR): $(BASE) $(INST)/$(GMP) $(INST)/$(NTL) $(INST)/$(TERMCAP) $(INST)/$(MPFR)
198	$(SAGE_SPKG) $(SINGULAR) 2>&1	170	$(SAGE_SPKG) $(SINGULAR) 2>&1
199		171
200	$(INST)/$(PYCRYPTO): $(BASE) $(INST)/$(PYTHON)	172	$(INST)/$(PYCRYPTO): $(BASE) $(INST)/$(PYTHON)
Lines 209-230 Link Here
209	#$(INST)/$(GNUPLOT): $(BASE) $(INST)/$(TERMCAP) $(INST)/$(READLINE) $(INST)/$(LIBPNG)	181	#$(INST)/$(GNUPLOT): $(BASE) $(INST)/$(TERMCAP) $(INST)/$(READLINE) $(INST)/$(LIBPNG)
210	# $(SAGE_SPKG) $(GNUPLOT) 2>&1	182	# $(SAGE_SPKG) $(GNUPLOT) 2>&1
211		183
212	$(INST)/$(ZLIB): $(BASE)
213	$(SAGE_SPKG) $(ZLIB) 2>&1
214
215	#$(INST)/$(GNUPLOTPY): $(BASE) $(INST)/$(PYTHON) $(INST)/$(NUMPY)	184	#$(INST)/$(GNUPLOTPY): $(BASE) $(INST)/$(PYTHON) $(INST)/$(NUMPY)
216	# $(SAGE_SPKG) $(GNUPLOTPY) 2>&1	185	# $(SAGE_SPKG) $(GNUPLOTPY) 2>&1
217		186
218		187
219	## << NON-GUI matplotlib >>	188	## << NON-GUI matplotlib >>
220		189
221	$(INST)/$(FREETYPE): $(BASE)	190	$(INST)/$(MATPLOTLIB): $(BASE) $(INST)/$(PYTHON) $(INST)/$(NUMPY) $(INST)/$(GDMODULE)
222	$(SAGE_SPKG) $(FREETYPE) 2>&1
223
224	$(INST)/$(LIBPNG): $(BASE)
225	$(SAGE_SPKG) $(LIBPNG) 2>&1
226
227	$(INST)/$(MATPLOTLIB): $(BASE) $(INST)/$(PYTHON) $(INST)/$(NUMPY) $(INST)/$(FREETYPE) $(INST)/$(LIBPNG) $(INST)/$(GDMODULE)
228	$(SAGE_SPKG) $(MATPLOTLIB) 2>&1	191	$(SAGE_SPKG) $(MATPLOTLIB) 2>&1
229		192
230		193
Lines 236-242 Link Here
236	$(INST)/$(GFAN): $(BASE) $(INST)/$(GMP) $(INST)/$(CDDLIB)	199	$(INST)/$(GFAN): $(BASE) $(INST)/$(GMP) $(INST)/$(CDDLIB)
237	$(SAGE_SPKG) $(GFAN) 2>&1	200	$(SAGE_SPKG) $(GFAN) 2>&1
238		201
239	$(INST)/$(TACHYON): $(BASE) $(INST)/$(LIBPNG)	202	$(INST)/$(TACHYON): $(BASE)
240	$(SAGE_SPKG) $(TACHYON) 2>&1	203	$(SAGE_SPKG) $(TACHYON) 2>&1
241		204
242	$(INST)/$(ECM): $(BASE) $(INST)/$(GMP)	205	$(INST)/$(ECM): $(BASE) $(INST)/$(GMP)
Lines 246-262 Link Here
246	#$(INST)/$(LIBSIGSEGV): $(BASE)	209	#$(INST)/$(LIBSIGSEGV): $(BASE)
247	# $(SAGE_SPKG) $(LIBSIGSEGV) 2>&1	210	# $(SAGE_SPKG) $(LIBSIGSEGV) 2>&1
248		211
249	$(INST)/$(CLISP): $(BASE) $(INST)/$(GMP) $(INST)/$(TERMCAP) $(INST)/$(READLINE)
250	$(SAGE_SPKG) $(CLISP) 2>&1
251
252	$(INST)/$(MAXIMA): $(BASE) $(INST)/$(CLISP)
253	$(SAGE_SPKG) $(MAXIMA) 2>&1
254
255	$(INST)/$(ZODB): $(INST)/$(PYTHON)	212	$(INST)/$(ZODB): $(INST)/$(PYTHON)
256	$(SAGE_SPKG) $(ZODB) 2>&1	213	$(SAGE_SPKG) $(ZODB) 2>&1
257	$(MAKEREL)	214	$(MAKEREL)
258		215
259	$(INST)/$(R): $(INST)/$(PYTHON) $(INST)/$(ATLAS)	216	$(INST)/$(R): $(INST)/$(PYTHON)
260	$(SAGE_SPKG) $(R) 2>&1	217	$(SAGE_SPKG) $(R) 2>&1
261	$(MAKEREL)	218	$(MAKEREL)
262		219
Lines 314-320 Link Here
314	$(INST)/$(NUMPY) \	271	$(INST)/$(NUMPY) \
315	$(INST)/$(NETWORKX) \	272	$(INST)/$(NETWORKX) \
316	$(INST)/$(GIVARO) \	273	$(INST)/$(GIVARO) \
317	$(INST)/$(GSL) \
318	$(INST)/$(QUADDOUBLE) \	274	$(INST)/$(QUADDOUBLE) \
319	$(INST)/$(GNUCRYPTOLIB) \	275	$(INST)/$(GNUCRYPTOLIB) \
320	$(INST)/$(SINGULAR) \	276	$(INST)/$(SINGULAR) \
Lines 323-329 Link Here
323	$(INST)/$(FPLLL) \	279	$(INST)/$(FPLLL) \
324	$(INST)/$(POLYBORI) \	280	$(INST)/$(POLYBORI) \
325	$(INST)/$(R) \	281	$(INST)/$(R) \
326	$(INST)/$(ATLAS) \
327	$(INST)/$(RUBIKS) \	282	$(INST)/$(RUBIKS) \
328	$(INST)/$(LIBM4RI) \	283	$(INST)/$(LIBM4RI) \
329	$(INST)/$(ECM)	284	$(INST)/$(ECM)
Lines 334-362 Link Here
334	$(INST)/$(DOC): $(INST)/$(SAGE)	289	$(INST)/$(DOC): $(INST)/$(SAGE)
335	$(SAGE_SPKG) $(DOC)	290	$(SAGE_SPKG) $(DOC)
336		291
337	$(INST)/$(FORTRAN):
338	$(SAGE_SPKG) $(FORTRAN) 2>&1
339
340	$(INST)/$(JMOL):	292	$(INST)/$(JMOL):
341	$(SAGE_SPKG) $(JMOL) 2>&1	293	$(SAGE_SPKG) $(JMOL) 2>&1
342		294
343	$(INST)/$(F2C): $(INST)/$(FORTRAN)	295	$(INST)/$(F2C):
344	$(SAGE_SPKG) $(INST)/$(F2C) 2>&1	296	$(SAGE_SPKG) $(INST)/$(F2C) 2>&1
345		297
346	$(INST)/$(LAPACK): $(INST)/$(FORTRAN)	298	$(INST)/$(NUMPY): $(BASE) $(INST)/$(PYTHON) $(INST)/$(F2C)
347	$(SAGE_SPKG) $(INST)/$(LAPACK) 2>&1
348
349	$(INST)/$(BLAS): $(INST)/$(FORTRAN)
350	$(SAGE_SPKG) $(INST)/$(BLAS) 2>&1
351
352	$(INST)/$(NUMPY): $(BASE) $(INST)/$(PYTHON) $(INST)/$(FORTRAN) $(INST)/$(F2C) $(INST)/$(LAPACK) $(INST)/$(BLAS) $(INST)/$(ATLAS)
353	$(SAGE_SPKG) $(NUMPY) 2>&1	299	$(SAGE_SPKG) $(NUMPY) 2>&1
		300	$(INST)/$(NUMPY): ATLAS=/usr/lib/libblas.so
		301	BLAS=/usr/lib/libblas.so
		302	LAPACK=/usr/lib/liblapack.so
		303	export ATLAS BLAS LAPACK
354		304
355	$(INST)/$(SCIPY): $(INST)/$(FORTRAN) $(INST)/$(F2C) $(INST)/$(LAPACK) $(INST)/$(BLAS) $(INST)/$(NUMPY)	305	$(INST)/$(SCIPY): $(INST)/$(F2C) $(INST)/$(NUMPY)
356	$(SAGE_SPKG) $(SCIPY) 2>&1	306	$(SAGE_SPKG) $(SCIPY) 2>&1
357		307
358	$(INST)/$(SCIPY_SANDBOX): $(INST)/$(SCIPY)	308	$(INST)/$(SCIPY_SANDBOX): $(INST)/$(SCIPY)
359	$(SAGE_SPKG) $(SCIPY_SANDBOX) 2>&1	309	$(SAGE_SPKG) $(SCIPY_SANDBOX) 2>&1
360		310
361	$(INST)/$(CVXOPT): $(INST)/$(FORTRAN) $(INST)/$(F2C) $(INST)/$(LAPACK) $(INST)/$(BLAS) $(INST)/$(NUMPY) $(INST)/$(ATLAS)	311	$(INST)/$(CVXOPT): $(INST)/$(F2C) $(INST)/$(NUMPY)
362	$(SAGE_SPKG) $(CVXOPT) 2>&1	312	$(SAGE_SPKG) $(CVXOPT) 2>&1