1 |
markusle 08/07/23 14:47:08 |
2 |
|
3 |
Modified: atlas-3.9.0-disable-ilaenv.patch |
4 |
Removed: atlas-3.9.0-upstream-fixes.patch |
5 |
Log: |
6 |
Version bump and further fixes to ilaenv patch. The latter now simply disables atlas' oldier version and uses the one in lapack-3.1.1 instead. |
7 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-SENTINEL-5 i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 sci-libs/lapack-atlas/files/atlas-3.9.0-disable-ilaenv.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/lapack-atlas/files/atlas-3.9.0-disable-ilaenv.patch?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/lapack-atlas/files/atlas-3.9.0-disable-ilaenv.patch?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/lapack-atlas/files/atlas-3.9.0-disable-ilaenv.patch?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: atlas-3.9.0-disable-ilaenv.patch |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/files/atlas-3.9.0-disable-ilaenv.patch,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- atlas-3.9.0-disable-ilaenv.patch 21 Jul 2008 13:44:28 -0000 1.1 |
23 |
+++ atlas-3.9.0-disable-ilaenv.patch 23 Jul 2008 14:47:08 -0000 1.2 |
24 |
@@ -1,12 +1,8 @@ |
25 |
diff -Naur ATLAS/makes/Make.Flp ATLAS.new/makes/Make.Flp |
26 |
---- ATLAS/makes/Make.Flp 2008-07-20 13:48:42.000000000 -0400 |
27 |
-+++ ATLAS.new/makes/Make.Flp 2008-07-20 13:47:53.000000000 -0400 |
28 |
-@@ -5,10 +5,10 @@ |
29 |
- |
30 |
- ilaobj = icmax1.o ilaver.o iparmq.o izmax1.o lsamen.o |
31 |
- |
32 |
--sobj = ATL_f77wrap_ilaenv.o ATL_f77wrap_sgesv.o ATL_f77wrap_sgetnb.o \ |
33 |
-+sobj = ATL_f77wrap_sgesv.o ATL_f77wrap_sgetnb.o \ |
34 |
+--- ATLAS/makes/Make.Flp 2008-07-17 21:24:46.000000000 -0400 |
35 |
++++ ATLAS.new/makes/Make.Flp 2008-07-22 10:54:45.000000000 -0400 |
36 |
+@@ -6,7 +6,7 @@ |
37 |
+ sobj = ATL_f77wrap_ilaenv.o ATL_f77wrap_sgesv.o ATL_f77wrap_sgetnb.o \ |
38 |
ATL_f77wrap_sgetrf.o ATL_f77wrap_sgetri.o ATL_f77wrap_sgetrs.o \ |
39 |
ATL_f77wrap_slauum.o ATL_f77wrap_sposv.o ATL_f77wrap_spotrf.o \ |
40 |
- ATL_f77wrap_spotrs.o ATL_f77wrap_strtri.o ieeeck.o ilaenv.o sgesv.o \ |
41 |
@@ -14,38 +10,30 @@ |
42 |
sgetrf.o sgetri.o sgetrs.o slauum.o sposv.o spotrf.o spotri.o spotrs.o \ |
43 |
strtri.o |
44 |
|
45 |
-@@ -65,9 +65,9 @@ |
46 |
- dobj = ATL_f77wrap_dgesv.o ATL_f77wrap_dgetnb.o ATL_f77wrap_dgetrf.o \ |
47 |
+@@ -64,8 +64,8 @@ |
48 |
ATL_f77wrap_dgetri.o ATL_f77wrap_dgetrs.o ATL_f77wrap_dlauum.o \ |
49 |
ATL_f77wrap_dposv.o ATL_f77wrap_dpotrf.o ATL_f77wrap_dpotrs.o \ |
50 |
-- ATL_f77wrap_dtrtri.o ATL_f77wrap_ilaenv.o dgesv.o dgetrf.o dgetri.o \ |
51 |
+ ATL_f77wrap_dtrtri.o ATL_f77wrap_ilaenv.o dgesv.o dgetrf.o dgetri.o \ |
52 |
- dgetrs.o dlauum.o dposv.o dpotrf.o dpotri.o dpotrs.o dtrtri.o ieeeck.o \ |
53 |
- ilaenv.o |
54 |
-+ ATL_f77wrap_dtrtri.o dgesv.o dgetrf.o dgetri.o \ |
55 |
+ dgetrs.o dlauum.o dposv.o dpotrf.o dpotri.o dpotrs.o dtrtri.o ieeeck.o |
56 |
-+ |
57 |
++ |
58 |
|
59 |
dlaobj = dbdsdc.o dbdsqr.o ddisna.o dgbbrd.o dgbcon.o dgbequ.o dgbsv.o \ |
60 |
dgbsvx.o dgbtf2.o dgbtrf.o dgbtrs.o dgebak.o dgebal.o dgebd2.o \ |
61 |
-@@ -122,9 +122,9 @@ |
62 |
- cobj = ATL_f77wrap_cgesv.o ATL_f77wrap_cgetnb.o ATL_f77wrap_cgetrf.o \ |
63 |
+@@ -121,8 +121,8 @@ |
64 |
ATL_f77wrap_cgetri.o ATL_f77wrap_cgetrs.o ATL_f77wrap_clauum.o \ |
65 |
ATL_f77wrap_cposv.o ATL_f77wrap_cpotrf.o ATL_f77wrap_cpotrs.o \ |
66 |
-- ATL_f77wrap_ctrtri.o ATL_f77wrap_ilaenv.o cgesv.o cgetrf.o cgetri.o \ |
67 |
+ ATL_f77wrap_ctrtri.o ATL_f77wrap_ilaenv.o cgesv.o cgetrf.o cgetri.o \ |
68 |
- cgetrs.o clauum.o cposv.o cpotrf.o cpotri.o cpotrs.o ctrtri.o ieeeck.o \ |
69 |
- ilaenv.o |
70 |
-+ ATL_f77wrap_ctrtri.o cgesv.o cgetrf.o cgetri.o \ |
71 |
+ cgetrs.o clauum.o cposv.o cpotrf.o cpotri.o cpotrs.o ctrtri.o ieeeck.o |
72 |
-+ |
73 |
++ |
74 |
|
75 |
claobj = cbdsqr.o cgbbrd.o cgbcon.o cgbequ.o cgbrfs.o cgbsv.o cgbsvx.o \ |
76 |
cgbtf2.o cgbtrf.o cgbtrs.o cgebak.o cgebal.o cgebd2.o cgebrd.o \ |
77 |
-@@ -171,10 +171,10 @@ |
78 |
- cunmlq.o cunmql.o cunmqr.o cunmr2.o cunmr3.o cunmrq.o cunmrz.o \ |
79 |
- cunmtr.o cupgtr.o cupmtr.o scsum1.o slamch.o |
80 |
- |
81 |
--zobj = ATL_f77wrap_ilaenv.o ATL_f77wrap_zgesv.o ATL_f77wrap_zgetnb.o \ |
82 |
-+zobj = ATL_f77wrap_zgesv.o ATL_f77wrap_zgetnb.o \ |
83 |
+@@ -172,7 +172,7 @@ |
84 |
+ zobj = ATL_f77wrap_ilaenv.o ATL_f77wrap_zgesv.o ATL_f77wrap_zgetnb.o \ |
85 |
ATL_f77wrap_zgetrf.o ATL_f77wrap_zgetri.o ATL_f77wrap_zgetrs.o \ |
86 |
ATL_f77wrap_zlauum.o ATL_f77wrap_zposv.o ATL_f77wrap_zpotrf.o \ |
87 |
- ATL_f77wrap_zpotrs.o ATL_f77wrap_ztrtri.o ieeeck.o ilaenv.o zgesv.o \ |
88 |
@@ -53,7 +41,7 @@ |
89 |
zgetrf.o zgetri.o zgetrs.o zlauum.o zposv.o zpotrf.o zpotri.o zpotrs.o \ |
90 |
ztrtri.o |
91 |
|
92 |
-@@ -228,7 +228,7 @@ |
93 |
+@@ -226,7 +226,7 @@ |
94 |
lib : dlib slib zlib clib |
95 |
clean : dclean sclean zclean cclean iclean |
96 |
iclean : |
97 |
@@ -62,12 +50,8 @@ |
98 |
|
99 |
sclean : |
100 |
rm -f $(sobj) slib.grd slalib.grd $(slaobj) |
101 |
-@@ -460,12 +460,8 @@ |
102 |
- $(ICC) $(ICCFLAGS) -o $@ -c -DDCPLX $(mySRCdir)/f77wrap/ATL_f77wrap_getnb.c |
103 |
- |
104 |
- |
105 |
--ATL_f77wrap_ilaenv.o : $(mySRCdir)/f77wrap/ATL_f77wrap_ilaenv.c |
106 |
-- $(ICC) $(ICCFLAGS) -o $@ -c $(mySRCdir)/f77wrap/ATL_f77wrap_ilaenv.c |
107 |
+@@ -462,8 +462,6 @@ |
108 |
+ $(ICC) $(ICCFLAGS) -o $@ -c $(mySRCdir)/f77wrap/ATL_f77wrap_ilaenv.c |
109 |
ieeeck.o : $(mySRCdir)/ieeeck.f |
110 |
$(F77) -o $@ -c $(F77FLAGS) $(mySRCdir)/ieeeck.f |
111 |
-ilaenv.o : $(mySRCdir)/ilaenv.f |
112 |
@@ -75,73 +59,3 @@ |
113 |
|
114 |
# |
115 |
# All the rest of these files are compiled directly from netlib LAPACK |
116 |
-diff -Naur ATLAS/makes/Make.lpsrc ATLAS.new/makes/Make.lpsrc |
117 |
---- ATLAS/makes/Make.lpsrc 2008-07-20 13:48:42.000000000 -0400 |
118 |
-+++ ATLAS.new/makes/Make.lpsrc 2008-07-20 13:46:37.000000000 -0400 |
119 |
-@@ -1,15 +1,11 @@ |
120 |
- include Make.inc |
121 |
- mySRCdir = $(SRCdir)/src/lapack |
122 |
- |
123 |
--iobj = ATL_ilaenv.o |
124 |
-- |
125 |
- include $(INCSdir)/gentoo_libtool.inc |
126 |
- |
127 |
- all : lib |
128 |
- lib : dlib slib zlib clib |
129 |
- clean : sclean dclean cclean zclean iclean |
130 |
--iclean : |
131 |
-- rm -f $(iobj) |
132 |
- |
133 |
- sobj = ATL_sgetrf.o ATL_sgetrfC.o ATL_sgetrfR.o ATL_sgetri.o ATL_sgetriC.o \ |
134 |
- ATL_sgetriR.o ATL_sgetrs.o ATL_slaswp.o ATL_slauum.o ATL_slauumCL.o \ |
135 |
-@@ -20,8 +16,8 @@ |
136 |
- incdep = $(INCSdir)/atlas_lapack.h |
137 |
- slib : |
138 |
- $(PMAKE) slib.grd |
139 |
--slib.grd : $(sobj) $(iobj) |
140 |
-- $(ARCHIVER) $(ARFLAGS) $(LAPACKlib) $(sobj) $(iobj) |
141 |
-+slib.grd : $(sobj) |
142 |
-+ $(ARCHIVER) $(ARFLAGS) $(LAPACKlib) $(sobj) |
143 |
- $(RANLIB) $(LAPACKlib) |
144 |
- touch slib.grd |
145 |
- |
146 |
-@@ -104,8 +100,8 @@ |
147 |
- incdep = $(INCSdir)/atlas_lapack.h |
148 |
- dlib : |
149 |
- $(PMAKE) dlib.grd |
150 |
--dlib.grd : $(dobj) $(iobj) |
151 |
-- $(ARCHIVER) $(ARFLAGS) $(LAPACKlib) $(dobj) $(iobj) |
152 |
-+dlib.grd : $(dobj) |
153 |
-+ $(ARCHIVER) $(ARFLAGS) $(LAPACKlib) $(dobj) |
154 |
- $(RANLIB) $(LAPACKlib) |
155 |
- touch dlib.grd |
156 |
- |
157 |
-@@ -189,8 +185,8 @@ |
158 |
- incdep = $(INCSdir)/atlas_lapack.h |
159 |
- clib : |
160 |
- $(PMAKE) clib.grd |
161 |
--clib.grd : $(cobj) $(iobj) |
162 |
-- $(ARCHIVER) $(ARFLAGS) $(LAPACKlib) $(cobj) $(iobj) |
163 |
-+clib.grd : $(cobj) |
164 |
-+ $(ARCHIVER) $(ARFLAGS) $(LAPACKlib) $(cobj) |
165 |
- $(RANLIB) $(LAPACKlib) |
166 |
- touch clib.grd |
167 |
- |
168 |
-@@ -280,8 +276,8 @@ |
169 |
- incdep = $(INCSdir)/atlas_lapack.h |
170 |
- zlib : |
171 |
- $(PMAKE) zlib.grd |
172 |
--zlib.grd : $(zobj) $(iobj) |
173 |
-- $(ARCHIVER) $(ARFLAGS) $(LAPACKlib) $(zobj) $(iobj) |
174 |
-+zlib.grd : $(zobj) |
175 |
-+ $(ARCHIVER) $(ARFLAGS) $(LAPACKlib) $(zobj) |
176 |
- $(RANLIB) $(LAPACKlib) |
177 |
- touch zlib.grd |
178 |
- |
179 |
-@@ -362,6 +358,3 @@ |
180 |
- zclean : |
181 |
- rm -f $(zobj) |
182 |
- |
183 |
--ATL_ilaenv.o : $(mySRCdir)/ATL_ilaenv.c $(incdep) |
184 |
-- $(DKC) $(DKCFLAGS) $(CDEFS) -c -o ATL_ilaenv.o $(mySRCdir)/ATL_ilaenv.c |
185 |
-- |