Simplify things: always build both shared and static libs.

Some ports (py-scipy for instance) have indirect deps on ATLAS (via py-numpy)
and require specific (static) version to work.

2 files changed, 119 insertions, 147 deletions

diff --git a/math/atlas/Makefile b/math/atlas/Makefile
index a4dfb0ea4eed..fd58671a95f8 100644
--- a/math/atlas/Makefile
+++ b/math/atlas/Makefile
@@ -23,13 +23,9 @@ CONFLICTS=	atlas-devel-[0-9]* cblas-[0-9]*
 MANUAL_PACKAGE_BUILD=	Optimizes for the local machine.
 
 OPTIONS_DEFINE=		DOCS DATA ARCHDEF TSC WALL_TIMER
-OPTIONS_DEFAULT=	DATA SHARED
-OPTIONS_MULTI=		BUILDTYPE
-OPTIONS_MULTI_BUILDTYPE=SHARED STATIC
+OPTIONS_DEFAULT=	DATA
 ARCHDEF_DESC=		Use a specified architectural default
 DATA_DESC=		Install tuning data and logs from the build
-SHARED_DESC=		Build static PIC archives and shared libraries
-STATIC_DESC=		Build static (non-PIC) archives
 TSC_DESC=		If WALL_TIMER is enabled, use the TSC
 WALL_TIMER_DESC=	Use less robust timing with higher resolution
 
@@ -73,17 +69,7 @@ IGNORE=		you have set WITH_ARCHDEF, but have not defined ARCHDEF
 .  endif
 .endif
 
-.if ${PORT_OPTIONS:MSHARED}
 USE_LDCONFIG=	yes
-.endif
-
-.for opt in SHARED STATIC
-.  if ${PORT_OPTIONS:M${opt}}
-PLIST_SUB+=	${opt}=""
-.  else
-PLIST_SUB+=	${opt}="@comment "
-.  endif
-.endfor
 
 EXTRA_FLAGS?=	-Wl,-rpath=${_GCC_RUNTIME}
 SHARED_FLAGS=	${PICFLAG} -DPIC
@@ -147,7 +133,6 @@ post-configure:
 
 do-build:
 .for opt in shared static
-.  if ${PORT_OPTIONS:M${opt:tu}}
 	@${ECHO_CMD} "Building the LAPACK archives with ${opt} ATLAS flags:"
 	F77FLAGS="`${MAKE} -f ${WRKSRC}/saved_flags -V F77FLAGS` ${EXTRA_FFLAGS}" ; \
 	LW=`${MAKE} -C ${PORTSDIR}/math/lapack -V ${${opt:tu}_LAPACK_WRKSRC}` ; \
@@ -181,7 +166,6 @@ do-build:
 	fi ; \
 	${ECHO_CMD} "Building ${opt} ATLAS:" ; cd ${WRKSRC}/${opt} ; \
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all
-.  endif
 .endfor
 
 L1=	${FC} $${F77FLAGS} ${SHARED_FLAGS} ${LDFLAGS} -shared -Wl,-x \
@@ -190,15 +174,12 @@ L2=	-Wl,--no-whole-archive -Wl,--as-needed -lpthread
 
 post-build:
 .for opt in shared static
-.  if ${PORT_OPTIONS:M${opt:tu}}
 	@${ECHO_CMD} "Timing ${opt} ATLAS:"
 	(cd ${WRKSRC}/${opt} ; ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} time ; \
 		cd ARCHS ; ${SETENV} ${MAKE_ENV} \
 			${MAKE_CMD} ${MAKE_ARGS} ArchNew tarfile)
-.  endif
 .endfor
-.if ${PORT_OPTIONS:MSHARED}
 	@${ECHO_CMD} "Building ATLAS shared libraries:"
 	@F77FLAGS="`${MAKE} -f ${WRKSRC}/saved_flags -V F77FLAGS` ${EXTRA_FFLAGS}" ; \
 	cd ${WRKSRC}/shared/lib ; \
@@ -208,7 +189,6 @@ post-build:
 	${L1}libcblas.so.2 -o libcblas.so.2 libcblas.a ${L2} libatlas.so.2 ; \
 	${L1}libptcblas.so.2 -o libptcblas.so.2 libptcblas.a ${L2} libatlas.so.2 ; \
 	${L1}libalapack.so.2 -o libalapack.so.2 liblapack.a ${L2} libatlas.so.2
-.endif
 
 .if defined(MAINTAINER_MODE)
 STATIC_BLAS=	${LOCALBASE}/lib/libblas.a
@@ -216,33 +196,26 @@ SHARED_BLAS=	-L${LOCALBASE}/lib -lblas
 
 check regression-test test: build
 .  for opt in shared static
-.    if ${PORT_OPTIONS:M${opt:tu}}
 	@${ECHO_CMD} "Testing ${opt} ATLAS:"
 	@cd ${WRKSRC}/${opt} ; ${SETENV} ${MAKE_ENV} BLAS="${${opt:tu}_BLAS}" \
 	${MAKE_CMD} ${MAKE_ARGS} check ptcheck error_report
-.    endif
 .  endfor
 .endif
 
 do-install:
 .for i in libatlas libcblas libf77blas liblapack libptcblas libptf77blas
-.  if ${PORT_OPTIONS:MSTATIC}
 	${INSTALL_DATA} ${WRKSRC}/static/lib/${i}.a \
 		${STAGEDIR}${PREFIX}/lib/${i:S|lapack|alapack|}.a
-.  endif
-.  if ${PORT_OPTIONS:MSHARED}
 	${INSTALL_DATA} ${WRKSRC}/shared/lib/${i}.a \
 		${STAGEDIR}${PREFIX}/lib/${i:S|lapack|alapack|}_pic.a
 	${INSTALL_LIB} ${WRKSRC}/shared/lib/${i:S|lapack|alapack|}.so.2 \
 		${STAGEDIR}${PREFIX}/lib
 	${LN} -sf ${i:S|lapack|alapack|}.so.2 \
 		${STAGEDIR}${PREFIX}/lib/${i:S|lapack|alapack|}.so
-.  endif
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/include/cblas.h ${WRKSRC}/include/clapack.h \
 		${STAGEDIR}${PREFIX}/include
 .for opt in shared static
-.  if ${PORT_OPTIONS:M${opt:tu}}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/atlas/${opt}
 	${INSTALL_DATA} ${WRKSRC}/${opt}/include/* \
 		${STAGEDIR}${PREFIX}/include/atlas/${opt}
@@ -254,7 +227,6 @@ do-install:
 		${COPYTREE_SHARE} "*" ${STAGEDIR}${DATADIR}/${opt} \
 		"! -name Makefile -and ! -name *.tgz")
 .    endif
-.  endif
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/math/atlas/pkg-plist b/math/atlas/pkg-plist
index 529556f7d1ea..678f053dbf14 100644
--- a/math/atlas/pkg-plist
+++ b/math/atlas/pkg-plist
@@ -1,120 +1,120 @@
 include/cblas.h
 include/clapack.h
-%%STATIC%%include/atlas/static/atlas_buildinfo.h
-%%STATIC%%include/atlas/static/atlas_cNCmm.h
-%%STATIC%%include/atlas/static/atlas_cacheedge.h
-%%STATIC%%include/atlas/static/atlas_cmv.h
-%%STATIC%%include/atlas/static/atlas_cmvN.h
-%%STATIC%%include/atlas/static/atlas_cmvS.h
-%%STATIC%%include/atlas/static/atlas_cmvT.h
-%%STATIC%%include/atlas/static/atlas_cr1.h
-%%STATIC%%include/atlas/static/atlas_csNKB.h
-%%STATIC%%include/atlas/static/atlas_csysinfo.h
-%%STATIC%%include/atlas/static/atlas_ctrsmXover.h
-%%STATIC%%include/atlas/static/atlas_dNCmm.h
-%%STATIC%%include/atlas/static/atlas_dmv.h
-%%STATIC%%include/atlas/static/atlas_dmvN.h
-%%STATIC%%include/atlas/static/atlas_dmvS.h
-%%STATIC%%include/atlas/static/atlas_dmvT.h
-%%STATIC%%include/atlas/static/atlas_dr1.h
-%%STATIC%%include/atlas/static/atlas_dsysinfo.h
-%%STATIC%%include/atlas/static/atlas_dtrsmXover.h
-%%STATIC%%include/atlas/static/atlas_pthreads.h
-%%STATIC%%include/atlas/static/atlas_sNCmm.h
-%%STATIC%%include/atlas/static/atlas_smv.h
-%%STATIC%%include/atlas/static/atlas_smvN.h
-%%STATIC%%include/atlas/static/atlas_smvS.h
-%%STATIC%%include/atlas/static/atlas_smvT.h
-%%STATIC%%include/atlas/static/atlas_sr1.h
-%%STATIC%%include/atlas/static/atlas_ssysinfo.h
-%%STATIC%%include/atlas/static/atlas_strsmXover.h
-%%STATIC%%include/atlas/static/atlas_trsmNB.h
-%%STATIC%%include/atlas/static/atlas_type.h
-%%STATIC%%include/atlas/static/atlas_zNCmm.h
-%%STATIC%%include/atlas/static/atlas_zdNKB.h
-%%STATIC%%include/atlas/static/atlas_zmv.h
-%%STATIC%%include/atlas/static/atlas_zmvN.h
-%%STATIC%%include/atlas/static/atlas_zmvS.h
-%%STATIC%%include/atlas/static/atlas_zmvT.h
-%%STATIC%%include/atlas/static/atlas_zr1.h
-%%STATIC%%include/atlas/static/atlas_zsysinfo.h
-%%STATIC%%include/atlas/static/atlas_ztrsmXover.h
-%%STATIC%%include/atlas/static/cXover.h
-%%STATIC%%include/atlas/static/cmm.h
-%%STATIC%%include/atlas/static/dXover.h
-%%STATIC%%include/atlas/static/dmm.h
-%%STATIC%%include/atlas/static/sXover.h
-%%STATIC%%include/atlas/static/smm.h
-%%STATIC%%include/atlas/static/zXover.h
-%%STATIC%%include/atlas/static/zmm.h
-%%SHARED%%include/atlas/shared/atlas_buildinfo.h
-%%SHARED%%include/atlas/shared/atlas_cNCmm.h
-%%SHARED%%include/atlas/shared/atlas_cacheedge.h
-%%SHARED%%include/atlas/shared/atlas_cmv.h
-%%SHARED%%include/atlas/shared/atlas_cmvN.h
-%%SHARED%%include/atlas/shared/atlas_cmvS.h
-%%SHARED%%include/atlas/shared/atlas_cmvT.h
-%%SHARED%%include/atlas/shared/atlas_cr1.h
-%%SHARED%%include/atlas/shared/atlas_csNKB.h
-%%SHARED%%include/atlas/shared/atlas_csysinfo.h
-%%SHARED%%include/atlas/shared/atlas_ctrsmXover.h
-%%SHARED%%include/atlas/shared/atlas_dNCmm.h
-%%SHARED%%include/atlas/shared/atlas_dmv.h
-%%SHARED%%include/atlas/shared/atlas_dmvN.h
-%%SHARED%%include/atlas/shared/atlas_dmvS.h
-%%SHARED%%include/atlas/shared/atlas_dmvT.h
-%%SHARED%%include/atlas/shared/atlas_dr1.h
-%%SHARED%%include/atlas/shared/atlas_dsysinfo.h
-%%SHARED%%include/atlas/shared/atlas_dtrsmXover.h
-%%SHARED%%include/atlas/shared/atlas_pthreads.h
-%%SHARED%%include/atlas/shared/atlas_sNCmm.h
-%%SHARED%%include/atlas/shared/atlas_smv.h
-%%SHARED%%include/atlas/shared/atlas_smvN.h
-%%SHARED%%include/atlas/shared/atlas_smvS.h
-%%SHARED%%include/atlas/shared/atlas_smvT.h
-%%SHARED%%include/atlas/shared/atlas_sr1.h
-%%SHARED%%include/atlas/shared/atlas_ssysinfo.h
-%%SHARED%%include/atlas/shared/atlas_strsmXover.h
-%%SHARED%%include/atlas/shared/atlas_trsmNB.h
-%%SHARED%%include/atlas/shared/atlas_type.h
-%%SHARED%%include/atlas/shared/atlas_zNCmm.h
-%%SHARED%%include/atlas/shared/atlas_zdNKB.h
-%%SHARED%%include/atlas/shared/atlas_zmv.h
-%%SHARED%%include/atlas/shared/atlas_zmvN.h
-%%SHARED%%include/atlas/shared/atlas_zmvS.h
-%%SHARED%%include/atlas/shared/atlas_zmvT.h
-%%SHARED%%include/atlas/shared/atlas_zr1.h
-%%SHARED%%include/atlas/shared/atlas_zsysinfo.h
-%%SHARED%%include/atlas/shared/atlas_ztrsmXover.h
-%%SHARED%%include/atlas/shared/cXover.h
-%%SHARED%%include/atlas/shared/cmm.h
-%%SHARED%%include/atlas/shared/dXover.h
-%%SHARED%%include/atlas/shared/dmm.h
-%%SHARED%%include/atlas/shared/sXover.h
-%%SHARED%%include/atlas/shared/smm.h
-%%SHARED%%include/atlas/shared/zXover.h
-%%SHARED%%include/atlas/shared/zmm.h
-%%STATIC%%lib/libalapack.a
-%%SHARED%%lib/libalapack_pic.a
-%%SHARED%%lib/libalapack.so.2
-%%SHARED%%lib/libalapack.so
-%%STATIC%%lib/libatlas.a
-%%SHARED%%lib/libatlas_pic.a
-%%SHARED%%lib/libatlas.so.2
-%%SHARED%%lib/libatlas.so
-%%STATIC%%lib/libcblas.a
-%%SHARED%%lib/libcblas_pic.a
-%%SHARED%%lib/libcblas.so.2
-%%SHARED%%lib/libcblas.so
-%%STATIC%%lib/libf77blas.a
-%%SHARED%%lib/libf77blas_pic.a
-%%SHARED%%lib/libf77blas.so.2
-%%SHARED%%lib/libf77blas.so
-%%STATIC%%lib/libptcblas.a
-%%SHARED%%lib/libptcblas_pic.a
-%%SHARED%%lib/libptcblas.so.2
-%%SHARED%%lib/libptcblas.so
-%%STATIC%%lib/libptf77blas.a
-%%SHARED%%lib/libptf77blas_pic.a
-%%SHARED%%lib/libptf77blas.so.2
-%%SHARED%%lib/libptf77blas.so
+include/atlas/static/atlas_buildinfo.h
+include/atlas/static/atlas_cNCmm.h
+include/atlas/static/atlas_cacheedge.h
+include/atlas/static/atlas_cmv.h
+include/atlas/static/atlas_cmvN.h
+include/atlas/static/atlas_cmvS.h
+include/atlas/static/atlas_cmvT.h
+include/atlas/static/atlas_cr1.h
+include/atlas/static/atlas_csNKB.h
+include/atlas/static/atlas_csysinfo.h
+include/atlas/static/atlas_ctrsmXover.h
+include/atlas/static/atlas_dNCmm.h
+include/atlas/static/atlas_dmv.h
+include/atlas/static/atlas_dmvN.h
+include/atlas/static/atlas_dmvS.h
+include/atlas/static/atlas_dmvT.h
+include/atlas/static/atlas_dr1.h
+include/atlas/static/atlas_dsysinfo.h
+include/atlas/static/atlas_dtrsmXover.h
+include/atlas/static/atlas_pthreads.h
+include/atlas/static/atlas_sNCmm.h
+include/atlas/static/atlas_smv.h
+include/atlas/static/atlas_smvN.h
+include/atlas/static/atlas_smvS.h
+include/atlas/static/atlas_smvT.h
+include/atlas/static/atlas_sr1.h
+include/atlas/static/atlas_ssysinfo.h
+include/atlas/static/atlas_strsmXover.h
+include/atlas/static/atlas_trsmNB.h
+include/atlas/static/atlas_type.h
+include/atlas/static/atlas_zNCmm.h
+include/atlas/static/atlas_zdNKB.h
+include/atlas/static/atlas_zmv.h
+include/atlas/static/atlas_zmvN.h
+include/atlas/static/atlas_zmvS.h
+include/atlas/static/atlas_zmvT.h
+include/atlas/static/atlas_zr1.h
+include/atlas/static/atlas_zsysinfo.h
+include/atlas/static/atlas_ztrsmXover.h
+include/atlas/static/cXover.h
+include/atlas/static/cmm.h
+include/atlas/static/dXover.h
+include/atlas/static/dmm.h
+include/atlas/static/sXover.h
+include/atlas/static/smm.h
+include/atlas/static/zXover.h
+include/atlas/static/zmm.h
+include/atlas/shared/atlas_buildinfo.h
+include/atlas/shared/atlas_cNCmm.h
+include/atlas/shared/atlas_cacheedge.h
+include/atlas/shared/atlas_cmv.h
+include/atlas/shared/atlas_cmvN.h
+include/atlas/shared/atlas_cmvS.h
+include/atlas/shared/atlas_cmvT.h
+include/atlas/shared/atlas_cr1.h
+include/atlas/shared/atlas_csNKB.h
+include/atlas/shared/atlas_csysinfo.h
+include/atlas/shared/atlas_ctrsmXover.h
+include/atlas/shared/atlas_dNCmm.h
+include/atlas/shared/atlas_dmv.h
+include/atlas/shared/atlas_dmvN.h
+include/atlas/shared/atlas_dmvS.h
+include/atlas/shared/atlas_dmvT.h
+include/atlas/shared/atlas_dr1.h
+include/atlas/shared/atlas_dsysinfo.h
+include/atlas/shared/atlas_dtrsmXover.h
+include/atlas/shared/atlas_pthreads.h
+include/atlas/shared/atlas_sNCmm.h
+include/atlas/shared/atlas_smv.h
+include/atlas/shared/atlas_smvN.h
+include/atlas/shared/atlas_smvS.h
+include/atlas/shared/atlas_smvT.h
+include/atlas/shared/atlas_sr1.h
+include/atlas/shared/atlas_ssysinfo.h
+include/atlas/shared/atlas_strsmXover.h
+include/atlas/shared/atlas_trsmNB.h
+include/atlas/shared/atlas_type.h
+include/atlas/shared/atlas_zNCmm.h
+include/atlas/shared/atlas_zdNKB.h
+include/atlas/shared/atlas_zmv.h
+include/atlas/shared/atlas_zmvN.h
+include/atlas/shared/atlas_zmvS.h
+include/atlas/shared/atlas_zmvT.h
+include/atlas/shared/atlas_zr1.h
+include/atlas/shared/atlas_zsysinfo.h
+include/atlas/shared/atlas_ztrsmXover.h
+include/atlas/shared/cXover.h
+include/atlas/shared/cmm.h
+include/atlas/shared/dXover.h
+include/atlas/shared/dmm.h
+include/atlas/shared/sXover.h
+include/atlas/shared/smm.h
+include/atlas/shared/zXover.h
+include/atlas/shared/zmm.h
+lib/libalapack.a
+lib/libalapack_pic.a
+lib/libalapack.so.2
+lib/libalapack.so
+lib/libatlas.a
+lib/libatlas_pic.a
+lib/libatlas.so.2
+lib/libatlas.so
+lib/libcblas.a
+lib/libcblas_pic.a
+lib/libcblas.so.2
+lib/libcblas.so
+lib/libf77blas.a
+lib/libf77blas_pic.a
+lib/libf77blas.so.2
+lib/libf77blas.so
+lib/libptcblas.a
+lib/libptcblas_pic.a
+lib/libptcblas.so.2
+lib/libptcblas.so
+lib/libptf77blas.a
+lib/libptf77blas_pic.a
+lib/libptf77blas.so.2
+lib/libptf77blas.so