1 |
commit: 83897011293c763f4bade9ad27e6e81db06c3e7e |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Jan 29 09:15:42 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 29 20:09:39 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83897011 |
7 |
|
8 |
sci-libs/punc: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/3709 |
11 |
|
12 |
sci-libs/punc/files/0.2_p1-configure.patch | 49 -------- |
13 |
sci-libs/punc/files/0.2_p1-underlinking.patch | 144 ----------------------- |
14 |
sci-libs/punc/files/1.4-header.patch | 26 ----- |
15 |
sci-libs/punc/files/1.4-linking.patch | 158 -------------------------- |
16 |
sci-libs/punc/files/punc-0.2_p1-libdir.patch | 15 --- |
17 |
5 files changed, 392 deletions(-) |
18 |
|
19 |
diff --git a/sci-libs/punc/files/0.2_p1-configure.patch b/sci-libs/punc/files/0.2_p1-configure.patch |
20 |
deleted file mode 100644 |
21 |
index 7f4ce97..00000000 |
22 |
--- a/sci-libs/punc/files/0.2_p1-configure.patch |
23 |
+++ /dev/null |
24 |
@@ -1,49 +0,0 @@ |
25 |
-diff --git a/configure.ac b/configure.ac |
26 |
-index 633803d..279fad6 100644 |
27 |
---- a/configure.ac |
28 |
-+++ b/configure.ac |
29 |
-@@ -348,7 +348,7 @@ else |
30 |
- AC_CHECK_LIB(blas,dscal_, |
31 |
- [blas_use="yes";blas_lib="${blas_lib_path}-lblas"], |
32 |
- [blas_use="";blas_lib=""], |
33 |
-- [${blas_lib_path}-lblas -lvf2c]) |
34 |
-+ [${blas_lib_path}-lblas]) |
35 |
- if test -z "${blas_use}"; then |
36 |
- AC_MSG_RESULT([** BLAS library missing ...will BUILD **]) |
37 |
- blas="blas"; |
38 |
-@@ -410,7 +410,7 @@ else |
39 |
- AC_CHECK_LIB(lapack,dsysv_, |
40 |
- [lapack_use="yes";lapack_lib="${lapack_lib_path}-llapack"], |
41 |
- [lapack_use="";lapack_lib=""], |
42 |
-- [${lapack_lib_path}-llapack ${blas_lib} -lvf2c]) |
43 |
-+ [${lapack_lib_path}-llapack ${blas_lib}]) |
44 |
- if test -z "${lapack_use}"; then |
45 |
- AC_MSG_RESULT([** LAPACK library missing ...will BUILD **]) |
46 |
- lapack="lapack"; |
47 |
-@@ -472,7 +472,7 @@ else |
48 |
- AC_CHECK_LIB(superlu,Destroy_SuperMatrix_Store, |
49 |
- [superlu_use="yes";superlu_lib="${superlu_lib_path}-lsuperlu"], |
50 |
- [superlu_use="";superlu_lib=""], |
51 |
-- [${superlu_lib_path}-lsuperlu ${lapack_lib} ${blas_lib} -lvf2c]) |
52 |
-+ [${superlu_lib_path}-lsuperlu ${lapack_lib} ${blas_lib}]) |
53 |
- if test -z "${superlu_use}"; then |
54 |
- AC_MSG_RESULT([** SUPERLU library missing ...will BUILD **]) |
55 |
- superlu="superlu"; |
56 |
-@@ -534,7 +534,7 @@ else |
57 |
- AC_CHECK_LIB(arpack,dsgets_, |
58 |
- [arpack_use="yes";arpack_lib="${arpack_lib_path}-larpack"], |
59 |
- [arpack_use="";arpack_lib=""], |
60 |
-- [${arpack_lib_path}-larpack ${blas_lib} -lvf2c]) |
61 |
-+ [${arpack_lib_path}-larpack ${blas_lib}]) |
62 |
- if test -z "${arpack_use}"; then |
63 |
- AC_MSG_RESULT([** ARPACK library missing ...will BUILD **]) |
64 |
- arpack="arpack"; |
65 |
-@@ -658,7 +658,7 @@ else |
66 |
- AC_CHECK_LIB(pmg,buildg_, |
67 |
- [pmg_use="yes";pmg_lib="${pmg_lib_path}-lpmg"], |
68 |
- [pmg_use="";pmg_lib=""], |
69 |
-- [${pmg_lib_path}-lpmg ${blas_lib} -lvf2c]) |
70 |
-+ [${pmg_lib_path}-lpmg ${blas_lib}]) |
71 |
- if test -z "${pmg_use}"; then |
72 |
- AC_MSG_RESULT([** PMG library missing ...will BUILD **]) |
73 |
- pmg="pmg"; |
74 |
|
75 |
diff --git a/sci-libs/punc/files/0.2_p1-underlinking.patch b/sci-libs/punc/files/0.2_p1-underlinking.patch |
76 |
deleted file mode 100644 |
77 |
index f83c93f..00000000 |
78 |
--- a/sci-libs/punc/files/0.2_p1-underlinking.patch |
79 |
+++ /dev/null |
80 |
@@ -1,144 +0,0 @@ |
81 |
-diff --git a/configure.ac b/configure.ac |
82 |
-index 633803d..89a9fb4 100644 |
83 |
---- a/configure.ac |
84 |
-+++ b/configure.ac |
85 |
-@@ -50,7 +50,8 @@ dnl 2. checks for programs |
86 |
- AC_LANG_C |
87 |
- AC_PROG_CC |
88 |
- AC_PROG_CPP |
89 |
--AC_DISABLE_SHARED |
90 |
-+AC_PROG_F77 |
91 |
-+AC_F77_LIBRARY_LDFLAGS |
92 |
- AM_PROG_LIBTOOL |
93 |
- |
94 |
- dnl 3. checks for libraries |
95 |
-@@ -348,7 +349,7 @@ else |
96 |
- AC_CHECK_LIB(blas,dscal_, |
97 |
- [blas_use="yes";blas_lib="${blas_lib_path}-lblas"], |
98 |
- [blas_use="";blas_lib=""], |
99 |
-- [${blas_lib_path}-lblas -lvf2c]) |
100 |
-+ [${blas_lib_path}-lblas]) |
101 |
- if test -z "${blas_use}"; then |
102 |
- AC_MSG_RESULT([** BLAS library missing ...will BUILD **]) |
103 |
- blas="blas"; |
104 |
-@@ -410,7 +411,7 @@ else |
105 |
- AC_CHECK_LIB(lapack,dsysv_, |
106 |
- [lapack_use="yes";lapack_lib="${lapack_lib_path}-llapack"], |
107 |
- [lapack_use="";lapack_lib=""], |
108 |
-- [${lapack_lib_path}-llapack ${blas_lib} -lvf2c]) |
109 |
-+ [${lapack_lib_path}-llapack ${blas_lib}]) |
110 |
- if test -z "${lapack_use}"; then |
111 |
- AC_MSG_RESULT([** LAPACK library missing ...will BUILD **]) |
112 |
- lapack="lapack"; |
113 |
-@@ -472,7 +473,7 @@ else |
114 |
- AC_CHECK_LIB(superlu,Destroy_SuperMatrix_Store, |
115 |
- [superlu_use="yes";superlu_lib="${superlu_lib_path}-lsuperlu"], |
116 |
- [superlu_use="";superlu_lib=""], |
117 |
-- [${superlu_lib_path}-lsuperlu ${lapack_lib} ${blas_lib} -lvf2c]) |
118 |
-+ [${superlu_lib_path}-lsuperlu ${lapack_lib} ${blas_lib}]) |
119 |
- if test -z "${superlu_use}"; then |
120 |
- AC_MSG_RESULT([** SUPERLU library missing ...will BUILD **]) |
121 |
- superlu="superlu"; |
122 |
-@@ -534,7 +535,7 @@ else |
123 |
- AC_CHECK_LIB(arpack,dsgets_, |
124 |
- [arpack_use="yes";arpack_lib="${arpack_lib_path}-larpack"], |
125 |
- [arpack_use="";arpack_lib=""], |
126 |
-- [${arpack_lib_path}-larpack ${blas_lib} -lvf2c]) |
127 |
-+ [${arpack_lib_path}-larpack ${blas_lib}]) |
128 |
- if test -z "${arpack_use}"; then |
129 |
- AC_MSG_RESULT([** ARPACK library missing ...will BUILD **]) |
130 |
- arpack="arpack"; |
131 |
-@@ -658,7 +659,7 @@ else |
132 |
- AC_CHECK_LIB(pmg,buildg_, |
133 |
- [pmg_use="yes";pmg_lib="${pmg_lib_path}-lpmg"], |
134 |
- [pmg_use="";pmg_lib=""], |
135 |
-- [${pmg_lib_path}-lpmg ${blas_lib} -lvf2c]) |
136 |
-+ [${pmg_lib_path}-lpmg ${blas_lib}]) |
137 |
- if test -z "${pmg_use}"; then |
138 |
- AC_MSG_RESULT([** PMG library missing ...will BUILD **]) |
139 |
- pmg="pmg"; |
140 |
-@@ -846,10 +847,6 @@ AC_OUTPUT([ |
141 |
- src/base/Makefile |
142 |
- |
143 |
- src/vf2c/Makefile |
144 |
-- src/blas/Makefile |
145 |
-- src/lapack/Makefile |
146 |
-- src/superlu/Makefile |
147 |
-- src/arpack/Makefile |
148 |
- src/cgcode/Makefile |
149 |
- src/pmg/Makefile |
150 |
- |
151 |
-diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am |
152 |
-index e338300..903dd2f 100644 |
153 |
---- a/src/aaa_lib/Makefile.am |
154 |
-+++ b/src/aaa_lib/Makefile.am |
155 |
-@@ -92,11 +92,11 @@ libdir = ${prefix}/lib/${fetk_cpu_vendor_os} |
156 |
- lib_LTLIBRARIES = libpunc.la ${LIBVF2C} ${LIBBLAS} ${LIBLAPACK} ${LIBSUPERLU} ${LIBARPACK} ${LIBCGCODE} ${LIBPMG} |
157 |
- |
158 |
- libpunc_la_SOURCES = |
159 |
--libpunc_la_LIBADD = ${BASE_LIBS} |
160 |
-+libpunc_la_LIBADD = ${BASE_LIBS} -lm |
161 |
- libpunc_la_LDFLAGS = -version-info ${FETK_VERSION} |
162 |
- |
163 |
- libvf2c_la_SOURCES = |
164 |
--libvf2c_la_LIBADD = ${VF2C_LIBS} |
165 |
-+libvf2c_la_LIBADD = ${VF2C_LIBS} -lgfortran -lf2c -lm |
166 |
- libvf2c_la_LDFLAGS = -version-info ${FETK_VERSION} |
167 |
- |
168 |
- libblas_la_SOURCES = |
169 |
-@@ -108,7 +108,7 @@ liblapack_la_LIBADD = ${LAPACK_LIBS} |
170 |
- liblapack_la_LDFLAGS = -version-info ${FETK_VERSION} |
171 |
- |
172 |
- libsuperlu_la_SOURCES = |
173 |
--libsuperlu_la_LIBADD = ${SUPERLU_LIBS} |
174 |
-+libsuperlu_la_LIBADD = ${SUPERLU_LIBS} |
175 |
- libsuperlu_la_LDFLAGS = -version-info ${FETK_VERSION} |
176 |
- |
177 |
- libarpack_la_SOURCES = |
178 |
-@@ -116,10 +116,9 @@ libarpack_la_LIBADD = ${ARPACK_LIBS} |
179 |
- libarpack_la_LDFLAGS = -version-info ${FETK_VERSION} |
180 |
- |
181 |
- libcgcode_la_SOURCES = |
182 |
--libcgcode_la_LIBADD = ${CGCODE_LIBS} |
183 |
-+libcgcode_la_LIBADD = ${CGCODE_LIBS} ${VF2C_LIBS} -lblas -lgfortran -lm |
184 |
- libcgcode_la_LDFLAGS = -version-info ${FETK_VERSION} |
185 |
- |
186 |
- libpmg_la_SOURCES = |
187 |
--libpmg_la_LIBADD = ${PMG_LIBS} |
188 |
-+libpmg_la_LIBADD = ${VF2C_LIBS} ${PMG_LIBS} ${BASE_LIBS} -lgfortran -lf2c -lmaloc -lm |
189 |
- libpmg_la_LDFLAGS = -version-info ${FETK_VERSION} |
190 |
-- |
191 |
-diff --git a/src/pmg/Makefile.am b/src/pmg/Makefile.am |
192 |
-index 6f3108d..154aeba 100644 |
193 |
---- a/src/pmg/Makefile.am |
194 |
-+++ b/src/pmg/Makefile.am |
195 |
-@@ -38,11 +38,12 @@ always_built_SUBDIRS = |
196 |
- SUBDIRS = $(always_built_SUBDIRS) . |
197 |
- THISLIB = pmg |
198 |
- |
199 |
--noinst_LTLIBRARIES = libpmg.la |
200 |
-+lib_LTLIBRARIES = libpmg.la |
201 |
- |
202 |
--SRC = buildAd.c buildBd.c buildGd.c buildPd.c cgd.c cgmgd.c cgmgdrvd.c gsd.c matvecd.c mblasd.c mgcsd.c mgdrvd.c mgfasd.c mgsubd.c mikpckd.c mlinpckd.c ncgd.c ncgdrvd.c newdrvd.c newtond.c ngsd.c ngsdrvd.c ninterpd.c nrchd.c nrchdrvd.c nsmoothd.c nsord.c nsordrvd.c nwjd.c nwjdrvd.c powerd.c rchd.c smoothd.c sord.c wjd.c |
203 |
-+SRC = buildAd.c buildBd.c buildGd.c buildPd.c cgd.c cgmgd.c cgmgdrvd.c gsd.c matvecd.c mblasd.c mgcsd.c mgdrvd.c mgfasd.c mgsubd.c mikpckd.c mlinpckd.c ncgd.c ncgdrvd.c newdrvd.c newtond.c ngsd.c ngsdrvd.c ninterpd.c nrchd.c nrchdrvd.c nsmoothd.c nsord.c nsordrvd.c nwjd.c nwjdrvd.c powerd.c rchd.c smoothd.c sord.c wjd.c secd.c pded.f |
204 |
- |
205 |
- libpmg_la_SOURCES = ${SRC} |
206 |
-+libpmg_la_LIBADD = -lf2c ../vf2c/libvf2c.la |
207 |
- INCLUDES = @maloc_inc@ |
208 |
- AM_CFLAGS = @profile@ @pedantic_ansi@ |
209 |
- |
210 |
-diff --git a/src/vf2c/main.c b/src/vf2c/main.c |
211 |
-index 4539749..6577570 100644 |
212 |
---- a/src/vf2c/main.c |
213 |
-+++ b/src/vf2c/main.c |
214 |
-@@ -134,7 +134,9 @@ f_init(); |
215 |
- #ifndef NO_ONEXIT |
216 |
- ONEXIT(f_exit); |
217 |
- #endif |
218 |
--MAIN__(); |
219 |
-+int MAIN__( ) |
220 |
-+ { return(0); |
221 |
-+} |
222 |
- #ifdef NO_ONEXIT |
223 |
- f_exit(); |
224 |
- #endif |
225 |
|
226 |
diff --git a/sci-libs/punc/files/1.4-header.patch b/sci-libs/punc/files/1.4-header.patch |
227 |
deleted file mode 100644 |
228 |
index e0b2d31..00000000 |
229 |
--- a/sci-libs/punc/files/1.4-header.patch |
230 |
+++ /dev/null |
231 |
@@ -1,26 +0,0 @@ |
232 |
-diff --git a/src/vf2c/punc/vsuperlu.h b/src/vf2c/punc/vsuperlu.h |
233 |
-index d0e7fb3..cb7977a 100644 |
234 |
---- a/src/vf2c/punc/vsuperlu.h |
235 |
-+++ b/src/vf2c/punc/vsuperlu.h |
236 |
-@@ -34,7 +34,7 @@ |
237 |
- |
238 |
- #include <punc/punc_base.h> |
239 |
- |
240 |
--#include <punc/slu_ddefs.h> |
241 |
-+#include <superlu/slu_ddefs.h> |
242 |
- |
243 |
- #endif /* _VSUPERLU_H_ */ |
244 |
- |
245 |
-diff --git a/src/vf2c/punc/vumfpack.h b/src/vf2c/punc/vumfpack.h |
246 |
-index 06896f3..e90aca6 100644 |
247 |
---- a/src/vf2c/punc/vumfpack.h |
248 |
-+++ b/src/vf2c/punc/vumfpack.h |
249 |
-@@ -34,7 +34,7 @@ |
250 |
- |
251 |
- #include <punc/punc_base.h> |
252 |
- |
253 |
--#include <punc/umfpack.h> |
254 |
-+#include <umfpack.h> |
255 |
- |
256 |
- #endif /* _VUMFPACK_H_ */ |
257 |
- |
258 |
|
259 |
diff --git a/sci-libs/punc/files/1.4-linking.patch b/sci-libs/punc/files/1.4-linking.patch |
260 |
deleted file mode 100644 |
261 |
index bdd19e7..00000000 |
262 |
--- a/sci-libs/punc/files/1.4-linking.patch |
263 |
+++ /dev/null |
264 |
@@ -1,158 +0,0 @@ |
265 |
-diff --git a/configure.ac b/configure.ac |
266 |
-index fcff075..f1262da 100644 |
267 |
---- a/configure.ac |
268 |
-+++ b/configure.ac |
269 |
-@@ -48,7 +48,8 @@ dnl 2. checks for programs |
270 |
- AC_LANG_C |
271 |
- AC_PROG_CC |
272 |
- AC_PROG_CPP |
273 |
--AC_DISABLE_SHARED |
274 |
-+AC_PROG_F77 |
275 |
-+AC_F77_LIBRARY_LDFLAGS |
276 |
- AM_PROG_LIBTOOL |
277 |
- |
278 |
- dnl 3. checks for libraries |
279 |
-@@ -358,7 +359,7 @@ else |
280 |
- AC_CHECK_LIB(blas,dscal_, |
281 |
- [blas_use="yes";blas_lib="${blas_lib_path}-lblas"], |
282 |
- [blas_use="";blas_lib=""], |
283 |
-- [${blas_lib_path}-lblas -lvf2c]) |
284 |
-+ [${blas_lib_path}-lblas]) |
285 |
- if test -z "${blas_use}"; then |
286 |
- AC_MSG_RESULT([** BLAS library missing ...will BUILD **]) |
287 |
- blas="blas"; |
288 |
-@@ -413,7 +414,7 @@ else |
289 |
- AC_CHECK_LIB(lapack,dsysv_, |
290 |
- [lapack_use="yes";lapack_lib="${lapack_lib_path}-llapack"], |
291 |
- [lapack_use="";lapack_lib=""], |
292 |
-- [${lapack_lib_path}-llapack ${blas_lib} -lvf2c]) |
293 |
-+ [${lapack_lib_path}-llapack ${blas_lib}]) |
294 |
- if test -z "${lapack_use}"; then |
295 |
- AC_MSG_RESULT([** LAPACK library missing ...will BUILD **]) |
296 |
- lapack="lapack"; |
297 |
-@@ -465,10 +466,10 @@ else |
298 |
- LDFLAGS_SAVE=${LDFLAGS}; |
299 |
- LDFLAGS=${amd_lib_path}; |
300 |
- amd_use=""; |
301 |
-- AC_CHECK_LIB(amd,AMD_order, |
302 |
-+ AC_CHECK_LIB(amd,amd_order, |
303 |
- [amd_use="yes";amd_lib="${amd_lib_path}-lamd"], |
304 |
- [amd_use="";amd_lib=""], |
305 |
-- [${amd_lib_path}-lamd ${blas_lib} -lvf2c]) |
306 |
-+ [${amd_lib_path}-lamd ${blas_lib}]) |
307 |
- if test -z "${amd_use}"; then |
308 |
- AC_MSG_RESULT([** AMD library missing ...will BUILD **]) |
309 |
- amd="amd"; |
310 |
-@@ -520,10 +521,10 @@ else |
311 |
- LDFLAGS_SAVE=${LDFLAGS}; |
312 |
- LDFLAGS=${umfpack_lib_path}; |
313 |
- umfpack_use=""; |
314 |
-- AC_CHECK_LIB(umfpack,UMFPACK_numeric, |
315 |
-+ AC_CHECK_LIB(umfpack,umfpack_di_numeric, |
316 |
- [umfpack_use="yes";umfpack_lib="${umfpack_lib_path}-lumfpack"], |
317 |
- [umfpack_use="";umfpack_lib=""], |
318 |
-- [${umfpack_lib_path}-lumfpack ${blas_lib} -lvf2c]) |
319 |
-+ [${umfpack_lib_path}-lumfpack ${blas_lib}]) |
320 |
- if test -z "${umfpack_use}"; then |
321 |
- AC_MSG_RESULT([** UMFPACK library missing ...will BUILD **]) |
322 |
- umfpack="umfpack"; |
323 |
-@@ -578,7 +579,7 @@ else |
324 |
- AC_CHECK_LIB(superlu,Destroy_SuperMatrix_Store, |
325 |
- [superlu_use="yes";superlu_lib="${superlu_lib_path}-lsuperlu"], |
326 |
- [superlu_use="";superlu_lib=""], |
327 |
-- [${superlu_lib_path}-lsuperlu ${lapack_lib} ${blas_lib} -lvf2c]) |
328 |
-+ [${superlu_lib_path}-lsuperlu ${lapack_lib} ${blas_lib}]) |
329 |
- if test -z "${superlu_use}"; then |
330 |
- AC_MSG_RESULT([** SUPERLU library missing ...will BUILD **]) |
331 |
- superlu="superlu"; |
332 |
-@@ -633,7 +634,7 @@ else |
333 |
- AC_CHECK_LIB(arpack,dsgets_, |
334 |
- [arpack_use="yes";arpack_lib="${arpack_lib_path}-larpack"], |
335 |
- [arpack_use="";arpack_lib=""], |
336 |
-- [${arpack_lib_path}-larpack ${blas_lib} -lvf2c]) |
337 |
-+ [${arpack_lib_path}-larpack ${blas_lib}]) |
338 |
- if test -z "${arpack_use}"; then |
339 |
- AC_MSG_RESULT([** ARPACK library missing ...will BUILD **]) |
340 |
- arpack="arpack"; |
341 |
-@@ -688,7 +689,7 @@ else |
342 |
- AC_CHECK_LIB(cgcode,scgdrv_, |
343 |
- [cgcode_use="yes";cgcode_lib="${cgcode_lib_path}-lcgcode"], |
344 |
- [cgcode_use="";cgcode_lib=""], |
345 |
-- [${cgcode_lib_path}-lcgcode ${blas_lib} -lvf2c]) |
346 |
-+ [${cgcode_lib_path}-lcgcode ${blas_lib}]) |
347 |
- if test -z "${cgcode_use}"; then |
348 |
- AC_MSG_RESULT([** CGCODE library missing ...will BUILD **]) |
349 |
- cgcode="cgcode"; |
350 |
-@@ -743,7 +744,7 @@ else |
351 |
- AC_CHECK_LIB(pmg,buildg_, |
352 |
- [pmg_use="yes";pmg_lib="${pmg_lib_path}-lpmg"], |
353 |
- [pmg_use="";pmg_lib=""], |
354 |
-- [${pmg_lib_path}-lpmg ${blas_lib} -lvf2c]) |
355 |
-+ [${pmg_lib_path}-lpmg ${blas_lib}]) |
356 |
- if test -z "${pmg_use}"; then |
357 |
- AC_MSG_RESULT([** PMG library missing ...will BUILD **]) |
358 |
- pmg="pmg"; |
359 |
-@@ -982,13 +983,6 @@ AC_OUTPUT([ |
360 |
- src/base/Makefile |
361 |
- |
362 |
- src/vf2c/Makefile |
363 |
-- src/blas/Makefile |
364 |
-- src/lapack/Makefile |
365 |
-- src/amd/Makefile |
366 |
-- src/umfpack/Makefile |
367 |
-- src/superlu/Makefile |
368 |
-- src/arpack/Makefile |
369 |
-- src/cgcode/Makefile |
370 |
- src/pmg/Makefile |
371 |
- |
372 |
- src/aaa_inc/Makefile |
373 |
-diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am |
374 |
-index 2e17d41..3cbb9b5 100644 |
375 |
---- a/src/aaa_lib/Makefile.am |
376 |
-+++ b/src/aaa_lib/Makefile.am |
377 |
-@@ -102,15 +102,14 @@ else |
378 |
- LIBPMG = |
379 |
- endif |
380 |
- |
381 |
--libdir = ${prefix}/lib |
382 |
- lib_LTLIBRARIES = libpunc.la ${LIBVF2C} ${LIBBLAS} ${LIBLAPACK} ${LIBAMD} ${LIBUMFPACK} ${LIBSUPERLU} ${LIBARPACK} ${LIBCGCODE} ${LIBPMG} |
383 |
- |
384 |
- libpunc_la_SOURCES = |
385 |
--libpunc_la_LIBADD = ${BASE_LIBS} |
386 |
-+libpunc_la_LIBADD = ${BASE_LIBS} -lm |
387 |
- libpunc_la_LDFLAGS = -version-info ${FETK_VERSION} |
388 |
- |
389 |
- libvf2c_la_SOURCES = |
390 |
--libvf2c_la_LIBADD = ${VF2C_LIBS} |
391 |
-+libvf2c_la_LIBADD = ${VF2C_LIBS} -lgfortran -lf2c -lm |
392 |
- libvf2c_la_LDFLAGS = -version-info ${FETK_VERSION} |
393 |
- |
394 |
- libblas_la_SOURCES = |
395 |
-@@ -142,6 +141,6 @@ libcgcode_la_LIBADD = ${CGCODE_LIBS} |
396 |
- libcgcode_la_LDFLAGS = -version-info ${FETK_VERSION} |
397 |
- |
398 |
- libpmg_la_SOURCES = |
399 |
--libpmg_la_LIBADD = ${PMG_LIBS} |
400 |
-+libpmg_la_LIBADD = ${PMG_LIBS} ${BASE_LIBS} -lgfortran -lf2c -lmaloc -lm |
401 |
- libpmg_la_LDFLAGS = -version-info ${FETK_VERSION} |
402 |
- |
403 |
-diff --git a/src/pmg/Makefile.am b/src/pmg/Makefile.am |
404 |
-index cae9324..8eb0ba0 100644 |
405 |
---- a/src/pmg/Makefile.am |
406 |
-+++ b/src/pmg/Makefile.am |
407 |
-@@ -38,13 +38,14 @@ always_built_SUBDIRS = |
408 |
- SUBDIRS = $(always_built_SUBDIRS) . |
409 |
- THISLIB = pmg |
410 |
- |
411 |
--noinst_LTLIBRARIES = libpmg.la |
412 |
-+lib_LTLIBRARIES = libpmg.la |
413 |
- |
414 |
- SRC = buildAd.c buildBd.c buildGd.c buildPd.c cgd.c cgmgd.c cgmgdrvd.c gsd.c matvecd.c mblasd.c mgcsd.c mgdrvd.c mgfasd.c mgsubd.c mikpckd.c mlinpckd.c ncgd.c ncgdrvd.c newdrvd.c newtond.c ngsd.c ngsdrvd.c ninterpd.c nrchd.c nrchdrvd.c nsmoothd.c nsord.c nsordrvd.c nwjd.c nwjdrvd.c powerd.c rchd.c smoothd.c sord.c wjd.c |
415 |
- |
416 |
- libpmg_la_SOURCES = ${SRC} |
417 |
- INCLUDES = @maloc_inc@ |
418 |
- AM_CFLAGS = @profile@ @pedantic_ansi@ |
419 |
-+libpmg_la_LIBADD = -lf2c |
420 |
- |
421 |
- all-local: |
422 |
- # -cp -p ${top_srcdir}/src/${THISLIB}/punc/*.h ../aaa_inc/punc/. |
423 |
|
424 |
diff --git a/sci-libs/punc/files/punc-0.2_p1-libdir.patch b/sci-libs/punc/files/punc-0.2_p1-libdir.patch |
425 |
deleted file mode 100644 |
426 |
index b8a973b..00000000 |
427 |
--- a/sci-libs/punc/files/punc-0.2_p1-libdir.patch |
428 |
+++ /dev/null |
429 |
@@ -1,15 +0,0 @@ |
430 |
-Index: punc/src/aaa_lib/Makefile.am |
431 |
-=================================================================== |
432 |
---- punc.orig/src/aaa_lib/Makefile.am |
433 |
-+++ punc/src/aaa_lib/Makefile.am |
434 |
-@@ -88,8 +88,8 @@ else |
435 |
- LIBPMG = |
436 |
- endif |
437 |
- |
438 |
--libdir = ${prefix}/lib/${fetk_cpu_vendor_os} |
439 |
--lib_LTLIBRARIES = libpunc.la ${LIBVF2C} ${LIBBLAS} ${LIBLAPACK} ${LIBSUPERLU} ${LIBARPACK} ${LIBCGCODE} ${LIBPMG} |
440 |
-+mylibdir = ${libdir}/${fetk_cpu_vendor_os} |
441 |
-+mylib_LTLIBRARIES = libpunc.la ${LIBVF2C} ${LIBBLAS} ${LIBLAPACK} ${LIBSUPERLU} ${LIBARPACK} ${LIBCGCODE} ${LIBPMG} |
442 |
- |
443 |
- libpunc_la_SOURCES = |
444 |
- libpunc_la_LIBADD = ${BASE_LIBS} |