Page MenuHomeFreeBSD
Files F161347957

D2060.id4213.diff
No OneTemporary
Actions

D2060.id4213.diff
View Options

Index: ./Makefile
===================================================================
--- ./Makefile
+++ ./Makefile
@@ -24,9 +24,14 @@
USE_PYTHON= concurrent distutils py3kplist
LDFLAGS+= -shared
-OPTIONS_DEFINE= ATLAS SUITESPARSE DOCS
+OPTIONS_DEFINE= SUITESPARSE DOCS
+OPTIONS_RADIO= BLASLIB
OPTIONS_DEFAULT= SUITESPARSE
-ATLAS_DESC= Use optimized blas library
+OPTIONS_RADIO_BLASLIB= ATLAS OPENBLAS BLAS
+ATLAS_DESC= Use optimized blas library
+BLAS_DESC= Use blas+lapack libraries
+OPENBLAS_DESC= Use openblas ibrary
+
SUITESPARSE_DESC= Use AMD and UMFPACK in SuiteSparse
PYDISTUTILS_CONFIGUREARGS+= --fcompiler=gnu95
@@ -37,8 +42,9 @@
DOCVERSION= 1.9.1
ATLAS_LIB_DEPENDS= libatlas.so:${PORTSDIR}/math/atlas
-ATLAS_LIB_DEPENDS_OFF= libblas.so:${PORTSDIR}/math/blas \
+BLAS_LIB_DEPENDS= libblas.so:${PORTSDIR}/math/blas \
liblapack.so:${PORTSDIR}/math/lapack
+OPENBLAS_LIB_DEPENDS= libopenblasp.so:${PORTSDIR}/math/openblas
SUITESPARSE_LIB_DEPENDS=libumfpack.so:${PORTSDIR}/math/suitesparse
.include <bsd.port.pre.mk>
@@ -55,10 +61,25 @@
GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so//
pre-configure:
-.if ${PORT_OPTIONS:MATLAS}
- @${REINPLACE_CMD} -e "s+%%ATLASLIBS%%+alapack, f77blas, cblas, atlas+" ${WRKSRC}/site.cfg
+.if ${PORT_OPTIONS:MOPENBLAS}
+ @${REINPLACE_CMD} -e "s+%%BLASNAME%%+openblas+" \
+ -e "s+%%LIBRARIES%%+libraries+" \
+ -e "s+%%LAPACKLIBS%%+%%BLASLIBS%%+" \
+ -e "s+%%BLASLIBS%%+openblasp, gfortran+" \
+ ${WRKSRC}/site.cfg
+.elif ${PORT_OPTIONS:MATLAS}
+ @${REINPLACE_CMD} -e "s+%%BLASNAME%%+atlas+" \
+ -e "s+%%LIBRARIES%%+atlas_libs+" \
+ -e "s+%%BLASLIBS%%+%%ATLASLIBS%%+" \
+ -e "s+%%LAPACKLIBS%%+alapack+" \
+ -e "s+%%ATLASLIBS%%+ptf77blas, ptcblas+" \
+ ${WRKSRC}/site.cfg
.else
- @${REINPLACE_CMD} -e "s+%%ATLASLIBS%%+lapack, blas+" ${WRKSRC}/site.cfg
+ @${REINPLACE_CMD} -e "s+%%BLASNAME%%+atlas+" \
+ -e "s+%%LIBRARIES%%+atlas_libs+" \
+ -e "s+%%BLASLIBS%%+blas+" \
+ -e "s+%%LAPACKLIBS%%+lapack+" \
+ ${WRKSRC}/site.cfg
.endif
.if !${PORT_OPTIONS:MSUITESPARSE}
@${REINPLACE_CMD} -e "s+:%%LOCALBASE%%/include/suitesparse++" ${WRKSRC}/site.cfg
Index: ./files/site.cfg
===================================================================
--- ./files/site.cfg
+++ ./files/site.cfg
@@ -1,10 +1,10 @@
[DEFAULT]
-lapack_type=atlas
library_dirs = /usr/lib:%%LOCALBASE%%/lib:%%GCCLIBDIR%%
include_dirs = /usr/include:%%LOCALBASE%%/include:%%LOCALBASE%%/include/suitesparse
src_dirs = %%LOCALBASE%%/src
# search static libraries (.a) in preference to shared ones (.so)
search_static_first = 0
-[atlas]
-library_dirs = %%LOCALBASE%%/lib:%%GCCLIBDIR%%
-atlas_libs = %%ATLASLIBS%%
+
+[%%BLASNAME%%]
+%%LIBRARIES%% = %%BLASLIBS%%
+lapack_libs = %%LAPACKLIBS%%
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Sat, Jul 4, 1:18 AM (10 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34644773
Default Alt Text
D2060.id4213.diff (2 KB)

Event Timeline