View | Details | Raw Unified | Return to bug 192744
Collapse All | Expand All

(-)Makefile (-19 / +14 lines)
Lines 35-41 Link Here
35
PORTSCOUT=	limitw:1,even
35
PORTSCOUT=	limitw:1,even
36
WRKSRC=		${WRKDIR}/ATLAS
36
WRKSRC=		${WRKDIR}/ATLAS
37
37
38
NO_STAGE=	yes
39
.include <bsd.port.pre.mk>
38
.include <bsd.port.pre.mk>
40
39
41
#Increase ATLAS_MAXMALLOC if the atlas threaded libraries perform poorly on large problems:
40
#Increase ATLAS_MAXMALLOC if the atlas threaded libraries perform poorly on large problems:
Lines 70-76 Link Here
70
ARCHDEFFLAG=	-Si archdef 0
69
ARCHDEFFLAG=	-Si archdef 0
71
.    endif
70
.    endif
72
.  else
71
.  else
73
IGNORE=		: You have set WITH_ARCHDEF, but have not defined ARCHDEF
72
IGNORE=		you have set WITH_ARCHDEF, but have not defined ARCHDEF
74
.  endif
73
.  endif
75
.endif
74
.endif
76
75
Lines 229-263 Link Here
229
do-install:
228
do-install:
230
.for i in libatlas libcblas libf77blas liblapack libptcblas libptf77blas
229
.for i in libatlas libcblas libf77blas liblapack libptcblas libptf77blas
231
.  if ${PORT_OPTIONS:MSTATIC}
230
.  if ${PORT_OPTIONS:MSTATIC}
232
	@${INSTALL_DATA} ${WRKSRC}/static/lib/${i}.a ${PREFIX}/lib/${i:S|lapack|alapack|}.a
231
	@${INSTALL_DATA} ${WRKSRC}/static/lib/${i}.a ${STAGEDIR}${PREFIX}/lib/${i:S|lapack|alapack|}.a
233
.  endif
232
.  endif
234
.  if ${PORT_OPTIONS:MSHARED}
233
.  if ${PORT_OPTIONS:MSHARED}
235
	@${INSTALL_DATA} ${WRKSRC}/shared/lib/${i}.a ${PREFIX}/lib/${i:S|lapack|alapack|}_pic.a
234
	@${INSTALL_DATA} ${WRKSRC}/shared/lib/${i}.a ${STAGEDIR}${PREFIX}/lib/${i:S|lapack|alapack|}_pic.a
236
	@${INSTALL_DATA} ${WRKSRC}/shared/lib/${i:S|lapack|alapack|}.so.2 ${PREFIX}/lib
235
	@${INSTALL_LIB} ${WRKSRC}/shared/lib/${i:S|lapack|alapack|}.so.2 ${STAGEDIR}${PREFIX}/lib
237
	@${LN} -sf ${i:S|lapack|alapack|}.so.2 ${PREFIX}/lib/${i:S|lapack|alapack|}.so
236
	@${LN} -sf ${i:S|lapack|alapack|}.so.2 ${STAGEDIR}${PREFIX}/lib/${i:S|lapack|alapack|}.so
238
.  endif
237
.  endif
239
.endfor
238
.endfor
240
	@${INSTALL_DATA} ${WRKSRC}/include/cblas.h   ${PREFIX}/include
239
	@${INSTALL_DATA} ${WRKSRC}/include/cblas.h   ${STAGEDIR}${PREFIX}/include
241
	@${INSTALL_DATA} ${WRKSRC}/include/clapack.h ${PREFIX}/include
240
	@${INSTALL_DATA} ${WRKSRC}/include/clapack.h ${STAGEDIR}${PREFIX}/include
242
.for opt in shared static
241
.for opt in shared static
243
.  if ${PORT_OPTIONS:M${opt:tu}}
242
.  if ${PORT_OPTIONS:M${opt:tu}}
244
	@${MKDIR} ${PREFIX}/include/atlas/${opt}
243
	@${MKDIR} ${STAGEDIR}${PREFIX}/include/atlas/${opt}
245
	@${INSTALL_DATA} ${WRKSRC}/${opt}/include/* ${PREFIX}/include/atlas/${opt}
244
	@${INSTALL_DATA} ${WRKSRC}/${opt}/include/* ${STAGEDIR}${PREFIX}/include/atlas/${opt}
246
	@cd ${PREFIX} ; \
247
	${FIND} include/atlas/${opt} -type f -o -type l | ${SORT} >> ${TMPPLIST}
248
	@${ECHO_CMD} "@dirrm include/atlas/${opt}" >> ${TMPPLIST}
249
.    if !defined(NOPORTDATA)
245
.    if !defined(NOPORTDATA)
250
	@${MKDIR} ${DATADIR}/${opt}
246
	@${MKDIR} ${STAGEDIR}${DATADIR}/${opt}
251
	@cd ${WRKSRC}/${opt}/bin ; ${TAR} -czf INSTALL_LOG.tgz INSTALL_LOG ; \
247
	@cd ${WRKSRC}/${opt}/bin ; ${TAR} -czf INSTALL_LOG.tgz INSTALL_LOG ; \
252
	${INSTALL_DATA} INSTALL_LOG.tgz ${DATADIR}/${opt}
248
	${INSTALL_DATA} INSTALL_LOG.tgz ${STAGEDIR}${DATADIR}/${opt}
253
	@${INSTALL_DATA} ${WRKSRC}/${opt}/ARCHS/*.tgz ${DATADIR}/${opt}
249
	@${INSTALL_DATA} ${WRKSRC}/${opt}/ARCHS/*.tgz ${STAGEDIR}${DATADIR}/${opt}
254
.    endif
250
.    endif
255
.  endif
251
.  endif
256
.endfor
252
.endfor
257
	@${ECHO_CMD} "@dirrm include/atlas" >> ${TMPPLIST}
258
.if ${PORT_OPTIONS:MDOCS}
253
.if ${PORT_OPTIONS:MDOCS}
259
	@${MKDIR} ${DOCSDIR}
254
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
260
	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
255
	@${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
261
.endif
256
.endif
262
257
263
.include <bsd.port.post.mk>
258
.include <bsd.port.post.mk>
(-)files/patch-tmpnamleak (+68 lines)
Line 0 Link Here
1
--- CONFIG/src/atlconf_misc.c.orig	2011-05-14 10:33:24.000000000 -0700
2
+++ CONFIG/src/atlconf_misc.c	2014-08-16 09:10:48.000000000 -0700
3
@@ -308,7 +308,10 @@
4
    if (targ) sprintf(ln, "ssh %s \"%s\" > %s 2>&1 \n", targ, cmnd, tnam);
5
    else sprintf(ln, "%s > %s 2>&1\n", cmnd, tnam);
6
    if (!system(ln)) return(tnam);
7
-   else return(NULL);
8
+   else {
9
+      remove(tnam);
10
+      return(NULL);
11
+   }
12
 }
13
 
14
 int CmndOneLine(char *targ, char *cmnd, char *ln)
15
@@ -330,6 +333,7 @@
16
       assert(fp);
17
       if (!fgets(ln, 2048, fp)) ln[0] = '\0';
18
       fclose(fp);
19
+      remove(tnam);
20
       return(0);
21
    }
22
    else ln[0] = '\0';
23
--- tune/sysinfo/emit_buildinfo.c.orig	2011-05-14 10:34:09.000000000 -0700
24
+++ tune/sysinfo/emit_buildinfo.c	2014-08-16 09:12:52.000000000 -0700
25
@@ -53,7 +53,10 @@
26
    sprintf(ln, "%s > %s\n", cmnd, tnam);
27
    fprintf(stderr, "system: %s", ln);
28
    if (!system(ln)) return(tnam);
29
-   else return(NULL);
30
+   else {
31
+      remove(tnam);
32
+      return(NULL);
33
+   }
34
 }
35
 
36
 void FixString(char *ln)
37
@@ -87,6 +90,7 @@
38
       assert(fp);
39
       if (!fgets(ln, 512, fp)) ln[0] = '\0';
40
       fclose(fp);
41
+      remove(tnam);
42
       return(0);
43
    }
44
    else ln[0] = '\0';
45
--- bin/atlas_install.c.orig	2011-05-14 10:33:23.000000000 -0700
46
+++ bin/atlas_install.c	2014-08-16 09:55:47.000000000 -0700
47
@@ -830,6 +830,7 @@
48
    fprintf(stdout, "ATLAS install complete.  Examine \n");
49
    fprintf(stdout, "ATLAS/bin/<arch>/INSTALL_LOG/SUMMARY.LOG for details.\n");
50
    fclose(fpsum);
51
+   remove(tnam);
52
    PrintBanner("INSTALL_LOG/SUMMARY.LOG", 0, 0, 0, 0);
53
 }
54
 
55
--- CONFIG/src/config.c.orig	2011-05-14 10:33:24.000000000 -0700
56
+++ CONFIG/src/config.c	2014-08-16 12:21:06.000000000 -0700
57
@@ -453,8 +453,10 @@
58
  */
59
 {
60
    char ln[4096], compsflags[1024], archflags[1024];
61
+   char *tmpnam;
62
    int i;
63
-   assert(CmndResults(NULL, "make xspew"));
64
+   assert(tmpnam = CmndResults(NULL, "make xspew"));
65
+   remove(tmpnam);
66
 /*
67
  * Translate compiler/flag array to xspew flags
68
  */
(-)pkg-plist (+97 lines)
Lines 1-5 Link Here
1
include/cblas.h
1
include/cblas.h
2
include/clapack.h
2
include/clapack.h
3
%%STATIC%%include/atlas/static/atlas_buildinfo.h
4
%%STATIC%%include/atlas/static/atlas_cNCmm.h
5
%%STATIC%%include/atlas/static/atlas_cacheedge.h
6
%%STATIC%%include/atlas/static/atlas_cmv.h
7
%%STATIC%%include/atlas/static/atlas_cmvN.h
8
%%STATIC%%include/atlas/static/atlas_cmvS.h
9
%%STATIC%%include/atlas/static/atlas_cmvT.h
10
%%STATIC%%include/atlas/static/atlas_cr1.h
11
%%STATIC%%include/atlas/static/atlas_csNKB.h
12
%%STATIC%%include/atlas/static/atlas_csysinfo.h
13
%%STATIC%%include/atlas/static/atlas_ctrsmXover.h
14
%%STATIC%%include/atlas/static/atlas_dNCmm.h
15
%%STATIC%%include/atlas/static/atlas_dmv.h
16
%%STATIC%%include/atlas/static/atlas_dmvN.h
17
%%STATIC%%include/atlas/static/atlas_dmvS.h
18
%%STATIC%%include/atlas/static/atlas_dmvT.h
19
%%STATIC%%include/atlas/static/atlas_dr1.h
20
%%STATIC%%include/atlas/static/atlas_dsysinfo.h
21
%%STATIC%%include/atlas/static/atlas_dtrsmXover.h
22
%%STATIC%%include/atlas/static/atlas_pthreads.h
23
%%STATIC%%include/atlas/static/atlas_sNCmm.h
24
%%STATIC%%include/atlas/static/atlas_smv.h
25
%%STATIC%%include/atlas/static/atlas_smvN.h
26
%%STATIC%%include/atlas/static/atlas_smvS.h
27
%%STATIC%%include/atlas/static/atlas_smvT.h
28
%%STATIC%%include/atlas/static/atlas_sr1.h
29
%%STATIC%%include/atlas/static/atlas_ssysinfo.h
30
%%STATIC%%include/atlas/static/atlas_strsmXover.h
31
%%STATIC%%include/atlas/static/atlas_trsmNB.h
32
%%STATIC%%include/atlas/static/atlas_type.h
33
%%STATIC%%include/atlas/static/atlas_zNCmm.h
34
%%STATIC%%include/atlas/static/atlas_zdNKB.h
35
%%STATIC%%include/atlas/static/atlas_zmv.h
36
%%STATIC%%include/atlas/static/atlas_zmvN.h
37
%%STATIC%%include/atlas/static/atlas_zmvS.h
38
%%STATIC%%include/atlas/static/atlas_zmvT.h
39
%%STATIC%%include/atlas/static/atlas_zr1.h
40
%%STATIC%%include/atlas/static/atlas_zsysinfo.h
41
%%STATIC%%include/atlas/static/atlas_ztrsmXover.h
42
%%STATIC%%include/atlas/static/cXover.h
43
%%STATIC%%include/atlas/static/cmm.h
44
%%STATIC%%include/atlas/static/dXover.h
45
%%STATIC%%include/atlas/static/dmm.h
46
%%STATIC%%include/atlas/static/sXover.h
47
%%STATIC%%include/atlas/static/smm.h
48
%%STATIC%%include/atlas/static/zXover.h
49
%%STATIC%%include/atlas/static/zmm.h
50
%%SHARED%%include/atlas/shared/atlas_buildinfo.h
51
%%SHARED%%include/atlas/shared/atlas_cNCmm.h
52
%%SHARED%%include/atlas/shared/atlas_cacheedge.h
53
%%SHARED%%include/atlas/shared/atlas_cmv.h
54
%%SHARED%%include/atlas/shared/atlas_cmvN.h
55
%%SHARED%%include/atlas/shared/atlas_cmvS.h
56
%%SHARED%%include/atlas/shared/atlas_cmvT.h
57
%%SHARED%%include/atlas/shared/atlas_cr1.h
58
%%SHARED%%include/atlas/shared/atlas_csNKB.h
59
%%SHARED%%include/atlas/shared/atlas_csysinfo.h
60
%%SHARED%%include/atlas/shared/atlas_ctrsmXover.h
61
%%SHARED%%include/atlas/shared/atlas_dNCmm.h
62
%%SHARED%%include/atlas/shared/atlas_dmv.h
63
%%SHARED%%include/atlas/shared/atlas_dmvN.h
64
%%SHARED%%include/atlas/shared/atlas_dmvS.h
65
%%SHARED%%include/atlas/shared/atlas_dmvT.h
66
%%SHARED%%include/atlas/shared/atlas_dr1.h
67
%%SHARED%%include/atlas/shared/atlas_dsysinfo.h
68
%%SHARED%%include/atlas/shared/atlas_dtrsmXover.h
69
%%SHARED%%include/atlas/shared/atlas_pthreads.h
70
%%SHARED%%include/atlas/shared/atlas_sNCmm.h
71
%%SHARED%%include/atlas/shared/atlas_smv.h
72
%%SHARED%%include/atlas/shared/atlas_smvN.h
73
%%SHARED%%include/atlas/shared/atlas_smvS.h
74
%%SHARED%%include/atlas/shared/atlas_smvT.h
75
%%SHARED%%include/atlas/shared/atlas_sr1.h
76
%%SHARED%%include/atlas/shared/atlas_ssysinfo.h
77
%%SHARED%%include/atlas/shared/atlas_strsmXover.h
78
%%SHARED%%include/atlas/shared/atlas_trsmNB.h
79
%%SHARED%%include/atlas/shared/atlas_type.h
80
%%SHARED%%include/atlas/shared/atlas_zNCmm.h
81
%%SHARED%%include/atlas/shared/atlas_zdNKB.h
82
%%SHARED%%include/atlas/shared/atlas_zmv.h
83
%%SHARED%%include/atlas/shared/atlas_zmvN.h
84
%%SHARED%%include/atlas/shared/atlas_zmvS.h
85
%%SHARED%%include/atlas/shared/atlas_zmvT.h
86
%%SHARED%%include/atlas/shared/atlas_zr1.h
87
%%SHARED%%include/atlas/shared/atlas_zsysinfo.h
88
%%SHARED%%include/atlas/shared/atlas_ztrsmXover.h
89
%%SHARED%%include/atlas/shared/cXover.h
90
%%SHARED%%include/atlas/shared/cmm.h
91
%%SHARED%%include/atlas/shared/dXover.h
92
%%SHARED%%include/atlas/shared/dmm.h
93
%%SHARED%%include/atlas/shared/sXover.h
94
%%SHARED%%include/atlas/shared/smm.h
95
%%SHARED%%include/atlas/shared/zXover.h
96
%%SHARED%%include/atlas/shared/zmm.h
97
@dirrm include/atlas
3
%%STATIC%%lib/libalapack.a
98
%%STATIC%%lib/libalapack.a
4
%%SHARED%%lib/libalapack_pic.a
99
%%SHARED%%lib/libalapack_pic.a
5
%%SHARED%%lib/libalapack.so.2
100
%%SHARED%%lib/libalapack.so.2
Lines 24-26 Link Here
24
%%SHARED%%lib/libptf77blas_pic.a
119
%%SHARED%%lib/libptf77blas_pic.a
25
%%SHARED%%lib/libptf77blas.so.2
120
%%SHARED%%lib/libptf77blas.so.2
26
%%SHARED%%lib/libptf77blas.so
121
%%SHARED%%lib/libptf77blas.so
122
%%STATIC%%@dirrm include/atlas/static
123
%%SHARED%%@dirrm include/atlas/shared

Return to bug 192744