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

(-)Makefile (-14 / +17 lines)
Lines 22-32 Link Here
22
CONFLICTS=	atlas-devel-[0-9]* cblas-[0-9]*
22
CONFLICTS=	atlas-devel-[0-9]* cblas-[0-9]*
23
MANUAL_PACKAGE_BUILD=	Optimizes for the local machine.
23
MANUAL_PACKAGE_BUILD=	Optimizes for the local machine.
24
24
25
OPTIONS_DEFINE=		ARCHDEF TSC WALL_TIMER
25
OPTIONS_DEFINE=		DOCS DATA ARCHDEF TSC WALL_TIMER
26
OPTIONS_DEFAULT=	SHARED
26
OPTIONS_DEFAULT=	DATA SHARED
27
OPTIONS_MULTI=		BUILDTYPE
27
OPTIONS_MULTI=		BUILDTYPE
28
OPTIONS_MULTI_BUILDTYPE=SHARED STATIC
28
OPTIONS_MULTI_BUILDTYPE=SHARED STATIC
29
ARCHDEF_DESC=		Use a specified architectural default
29
ARCHDEF_DESC=		Use a specified architectural default
30
DATA_DESC=		Install tuning data and logs from the build
30
SHARED_DESC=		Build static PIC archives and shared libraries
31
SHARED_DESC=		Build static PIC archives and shared libraries
31
STATIC_DESC=		Build static (non-PIC) archives
32
STATIC_DESC=		Build static (non-PIC) archives
32
TSC_DESC=		If WALL_TIMER is enabled, use the TSC
33
TSC_DESC=		If WALL_TIMER is enabled, use the TSC
Lines 57-67 Link Here
57
LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
58
LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
58
.endif
59
.endif
59
60
60
.for i in DATA DOCS
61
.if ${PORT_OPTIONS:MDATA}
61
.  if !defined(NOPORT${i})
62
PORTDATA=	*
62
PORT${i}=	*
63
.endif
63
.  endif
64
PORTDOCS=	*
64
.endfor
65
65
66
.if ${PORT_OPTIONS:MARCHDEF}
66
.if ${PORT_OPTIONS:MARCHDEF}
67
.  if defined(ARCHDEF)
67
.  if defined(ARCHDEF)
Lines 118-126 Link Here
118
	@${CAT} ${FILESDIR}/tuning-message
118
	@${CAT} ${FILESDIR}/tuning-message
119
119
120
do-configure:
120
do-configure:
121
	@if [ "x${WITH_WALL_TIMER}" != "x" ] ; then \
121
	@if [ ${PORT_OPTIONS:MWALL_TIMER} ] ; then \
122
		TIMEFLAG= ; \
122
		TIMEFLAG= ; \
123
		if [ \( ${ARCH} = "i386" -o ${ARCH} = "amd64" \) -a "x${WITH_TSC}" != "x" ] ; then \
123
		if [ \( ${ARCH} = "i386" -o ${ARCH} = "amd64" \) -a ${PORT_OPTIONS:MTSC} ] ; then \
124
			freq=`${SYSCTL} -ni machdep.tsc_freq` ; \
124
			freq=`${SYSCTL} -ni machdep.tsc_freq` ; \
125
			if [ "x$${freq}" != "x" ] ; then \
125
			if [ "x$${freq}" != "x" ] ; then \
126
				if [ $${freq} -gt 1000000 ] ; then \
126
				if [ $${freq} -gt 1000000 ] ; then \
Lines 153-160 Link Here
153
	@${ECHO_CMD} "Building the LAPACK archives with ${opt} ATLAS flags:"
153
	@${ECHO_CMD} "Building the LAPACK archives with ${opt} ATLAS flags:"
154
	F77FLAGS="`${MAKE} -f ${WRKSRC}/saved_flags -V F77FLAGS` ${EXTRA_FFLAGS}" ; \
154
	F77FLAGS="`${MAKE} -f ${WRKSRC}/saved_flags -V F77FLAGS` ${EXTRA_FFLAGS}" ; \
155
	LW=`${MAKE} -C ${PORTSDIR}/math/lapack -V ${${opt:tu}_LAPACK_WRKSRC}` ; \
155
	LW=`${MAKE} -C ${PORTSDIR}/math/lapack -V ${${opt:tu}_LAPACK_WRKSRC}` ; \
156
	${MAKE} -C ${PORTSDIR}/math/lapack WITH_${opt:tu}=yes \
156
	${MAKE} -C ${PORTSDIR}/math/lapack WITH=${opt:tu} clean patch ; \
157
		clean patch ; \
158
	cd $${LW} ; ${SETENV} ${MAKE_ENV:NFFLAGS=*} EXTRAFLAGS="${${opt:tu}_FLAGS}" \
157
	cd $${LW} ; ${SETENV} ${MAKE_ENV:NFFLAGS=*} EXTRAFLAGS="${${opt:tu}_FLAGS}" \
159
		FFLAGS="-pipe $${F77FLAGS}" ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} \
158
		FFLAGS="-pipe $${F77FLAGS}" ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} \
160
		ARCH="${AR}" lapacklib ; \
159
		ARCH="${AR}" lapacklib ; \
Lines 249-258 Link Here
249
	@${MKDIR} ${STAGEDIR}${PREFIX}/include/atlas/${opt}
248
	@${MKDIR} ${STAGEDIR}${PREFIX}/include/atlas/${opt}
250
	${INSTALL_DATA} ${WRKSRC}/${opt}/include/* \
249
	${INSTALL_DATA} ${WRKSRC}/${opt}/include/* \
251
		${STAGEDIR}${PREFIX}/include/atlas/${opt}
250
		${STAGEDIR}${PREFIX}/include/atlas/${opt}
251
.    if ${PORT_OPTIONS:MDATA}
252
	@${MKDIR} ${STAGEDIR}${DATADIR}/${opt}
252
	@${MKDIR} ${STAGEDIR}${DATADIR}/${opt}
253
	(cd ${WRKSRC}/${opt}/bin ; ${TAR} -czf INSTALL_LOG.tgz INSTALL_LOG ; \
253
	(cd ${WRKSRC}/${opt}/bin; \
254
	${INSTALL_DATA} INSTALL_LOG.tgz ${STAGEDIR}${DATADIR}/${opt})
254
		${COPYTREE_SHARE} INSTALL_LOG ${STAGEDIR}${DATADIR}/${opt})
255
	${INSTALL_DATA} ${WRKSRC}/${opt}/ARCHS/*.tgz ${STAGEDIR}${DATADIR}/${opt}
255
	(cd ${WRKSRC}/${opt}/ARCHS; \
256
		${COPYTREE_SHARE} "*" ${STAGEDIR}${DATADIR}/${opt} \
257
		"! -name Makefile -and ! -name *.tgz")
258
.    endif
256
.  endif
259
.  endif
257
.endfor
260
.endfor
258
.if ${PORT_OPTIONS:MDOCS}
261
.if ${PORT_OPTIONS:MDOCS}
(-)pkg-plist (-2 / +2 lines)
Lines 94-99 Link Here
94
%%SHARED%%include/atlas/shared/smm.h
94
%%SHARED%%include/atlas/shared/smm.h
95
%%SHARED%%include/atlas/shared/zXover.h
95
%%SHARED%%include/atlas/shared/zXover.h
96
%%SHARED%%include/atlas/shared/zmm.h
96
%%SHARED%%include/atlas/shared/zmm.h
97
%%STATIC%%@dirrm include/atlas/static
98
%%SHARED%%@dirrm include/atlas/shared
97
@dirrm include/atlas
99
@dirrm include/atlas
98
%%STATIC%%lib/libalapack.a
100
%%STATIC%%lib/libalapack.a
99
%%SHARED%%lib/libalapack_pic.a
101
%%SHARED%%lib/libalapack_pic.a
Lines 119-123 Link Here
119
%%SHARED%%lib/libptf77blas_pic.a
121
%%SHARED%%lib/libptf77blas_pic.a
120
%%SHARED%%lib/libptf77blas.so.2
122
%%SHARED%%lib/libptf77blas.so.2
121
%%SHARED%%lib/libptf77blas.so
123
%%SHARED%%lib/libptf77blas.so
122
%%STATIC%%@dirrm include/atlas/static
123
%%SHARED%%@dirrm include/atlas/shared

Return to bug 192823