Index: head/math/scalapack/Makefile =================================================================== --- head/math/scalapack/Makefile (revision 532421) +++ head/math/scalapack/Makefile (revision 532422) @@ -1,165 +1,173 @@ # Created by: NAKATA, Maho # $FreeBSD$ PORTNAME= scalapack PORTVERSION= 2.0.2 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= math MASTER_SITES= NL DISTFILES= scalapack-${PORTVERSION}.tgz manpages.tgz DIST_SUBDIR= scalapack EXTRACT_ONLY= scalapack-${PORTVERSION}.tgz manpages.tgz MAINTAINER= ports@FreeBSD.org COMMENT= ScaLAPACK Scalable LAPACK library LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE CONFLICTS= elmer-mathlibs-1* USES= cmake:insource fortran pathfix USE_LDCONFIG= yes CMAKE_ARGS_ST= -DBUILD_STATIC_LIBS:BOOL=ON CMAKE_ARGS_SH= -DBUILD_SHARED_LIBS:BOOL=ON CMAKE_ARGS= ${CMAKE_ARGS_ST} ARCH2FIX= PBLAS/SRC PBLAS/SRC/PBBLAS PBLAS/SRC/PTOOLS PBLAS/SRC/PTZBLAS \ REDIST/SRC SRC TOOLS TOOLS/LAPACK DATADIR= ${PREFIX}/share/${PORTNAME:tu} EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME:tu} SUB_FILES= pkg-message PLIST_SUB= SVERSION=${SVERSION} PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_RADIO= LA MPI OPTIONS_RADIO_LA= ATLAS BLAS LA_DESC= Linear Algebra library support BLAS_DESC= LAPACK blass implementation OPTIONS_RADIO_MPI= MPICH OPENMPI OPTIONS_DEFAULT= BLAS DOCS EXAMPLES MPICH DOCS_DISTFILES= scalapack_install.ps scalapackqref.ps \ lawn100.ps pblasqref.ps manual.ps design.ps \ pumma_refmanual.ps trans.ps ATLAS_LIB_DEPENDS= libatlas.so:math/atlas BLAS_LIB_DEPENDS= libblas.so:math/blas \ liblapack.so:math/lapack -OPENMPI_BUILD_DEPENDS= openmpi3>0:net/openmpi3 -OPENMPI_RUN_DEPENDS= openmpi3>0:net/openmpi3 -OPENMPI_CMAKE_ON= -DMPI_BASE_DIR=${LOCALBASE}/mpi/openmpi3 +OPENMPI_BUILD_DEPENDS= openmpi>0:net/openmpi +OPENMPI_RUN_DEPENDS= openmpi>0:net/openmpi +OPENMPI_CMAKE_ON= -DMPI_BASE_DIR=${LOCALBASE}/mpi/openmpi MPICH_BUILD_DEPENDS= ${LOCALBASE}/bin/mpicc:net/mpich MPICH_RUN_DEPENDS= ${LOCALBASE}/bin/mpicc:net/mpich MPICH_CMAKE_ON= -DMPI_BASE_DIR=${LOCALBASE} .include .if ${PORT_OPTIONS:MATLAS} BLAS= -lf77blas LAPACK= -lalapack -lcblas .else BLAS= -lblas LAPACK= -llapack .endif .if ${PORT_OPTIONS:MOPENMPI} -MPIF77= ${LOCALBASE}/mpi/openmpi3/bin/mpif77 -MPICC= ${LOCALBASE}/mpi/openmpi3/bin/mpicc +MPIF77= ${LOCALBASE}/mpi/openmpi/bin/mpif77 +MPICC= ${LOCALBASE}/mpi/openmpi/bin/mpicc .else MPIF77= ${LOCALBASE}/bin/mpif77 MPICC= ${LOCALBASE}/bin/mpicc .endif .if ${ARCH} == "sparc64" || ${ARCH} == "amd64" FPIC= -fPIC .else FPIC= -fpic .endif CFLAGS+= ${FPIC} FFLAGS+= ${FPIC} SVERSION= 2 .if defined(WITH_OPTIMIZED_FLAGS) .if ${ARCH} == "amd64" FFLAGS+= -pipe -O3 -ffast-math -funroll-all-loops -fpeel-loops -ftracer -funswitch-loops -funit-at-a-time CFLAGS+= -pipe -O3 -ffast-math -funroll-all-loops -fpeel-loops -ftracer -funswitch-loops -funit-at-a-time .elif ${ARCH} == "i386" FFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3 CFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3 .else FFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar CFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar .endif .endif NOOPT= -O0 # USES=fortran already forces FC to a supported fortran compiler; # assume mpicc points to a compatible compiler and force that, too. CC= ${MPICC} + +post-patch: + ${REINPLACE_CMD} -e 's|MPI_Type_struct|MPI_Type_create_struct|' \ + ${WRKSRC}/BLACS/SRC/igamx2d_.c ${WRKSRC}/BLACS/SRC/cgamn2d_.c \ + ${WRKSRC}/BLACS/SRC/dgamn2d_.c ${WRKSRC}/BLACS/SRC/zgamn2d_.c \ + ${WRKSRC}/BLACS/SRC/sgamn2d_.c ${WRKSRC}/BLACS/SRC/igamn2d_.c \ + ${WRKSRC}/BLACS/SRC/cgamx2d_.c ${WRKSRC}/BLACS/SRC/dgamx2d_.c \ + ${WRKSRC}/BLACS/SRC/zgamx2d_.c ${WRKSRC}/BLACS/SRC/sgamx2d_.c pre-configure: ${CP} -p ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist ${CP} ${WRKSRC}/SLmake.inc.example ${WRKSRC}/SLmake.inc ${REINPLACE_CMD} -e 's|@BLAS@|${BLAS}|g; s|@LAPACK@|${LAPACK}|g;s|@LAPACK@|${LAPACK}|g;s|@LAPACK@|${LAPACK}|g;s|@LAPACK@|${LAPACK}|g; s|@WRKSRC@|${WRKSRC}|g ; s|@LOCALBASE@|${LOCALBASE}|g ; s|@CC@|${CC}|g ; s|@CFLAGS@|${CFLAGS}|g ; s|@F77@|${F77}|g ; s|@MPIF77@|${MPIF77}|g ; s|@MPICC@|${MPICC}|g ; s|@FFLAGS@|${FFLAGS}|g ; s|@NOOPT@|${NOOPT}|g ; s|@F77EXTRAFLAGS@|${F77EXTRAFLAGS}|g ; s|^ARCH *.= ar|ARCMD = ar|' ${WRKSRC}/SLmake.inc .for mkf in ${ARCH2FIX} ${REINPLACE_CMD} -e 's|\$$(ARCH)|$$(ARCMD)|' ${WRKSRC}/${mkf}/Makefile .endfor post-build: ${RM} -r ${WRKSRC}/CMakeFiles ${WRKSRC}/CMakeCache.txt ${CP} -p ${WRKSRC}/Makefile.dist ${WRKSRC}/Makefile (cd ${WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS:C|BUILD_STATIC_LIBS|BUILD_SHARED_LIBS|} ${CMAKE_SOURCE_PATH}) (cd ${WRKSRC} && ${DO_MAKE_BUILD} ${ALL_TARGET}) post-install: ${INSTALL_DATA} ${WRKSRC}/lib/libscalapack.a ${STAGEDIR}${PREFIX}/lib ${MV} ${STAGEDIR}${PREFIX}/lib/libscalapack.so ${STAGEDIR}${PREFIX}/lib/libscalapack.so.${SVERSION} ${LN} -sf libscalapack.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/libscalapack.so ${INSTALL_MAN} ${WRKDIR}/MANPAGES/man/manl/*.l ${STAGEDIR}${PREFIX}/man/manl ${MKDIR} ${STAGEDIR}${PREFIX}/share/SCALAPACK/TESTING (cd ${WRKSRC}/TESTING/ ;\ ${INSTALL_PROGRAM} x* ${STAGEDIR}${PREFIX}/share/SCALAPACK/TESTING ;\ ${INSTALL_DATA} *.dat ${STAGEDIR}${PREFIX}/share/SCALAPACK/TESTING) ${INSTALL_DATA} ${FILESDIR}/scalapack.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/PBLAS/SRC/*.h ${STAGEDIR}${PREFIX}/include .if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/SCALAPACK ${INSTALL_DATA} ${FILESDIR}/Makefile ${STAGEDIR}${PREFIX}/share/examples/SCALAPACK ${INSTALL_DATA} ${FILESDIR}/example1.cc ${STAGEDIR}${PREFIX}/share/examples/SCALAPACK ${INSTALL_DATA} ${FILESDIR}/example1.f ${STAGEDIR}${PREFIX}/share/examples/SCALAPACK .endif .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${CAT} ${DISTDIR}/${DIST_SUBDIR}/design.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/design.ps.gz ${CAT} ${DISTDIR}/${DIST_SUBDIR}/lawn100.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/lawn100.ps.gz ${CAT} ${DISTDIR}/${DIST_SUBDIR}/manual.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/manual.ps.gz ${CAT} ${DISTDIR}/${DIST_SUBDIR}/pblasqref.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/pblasqref.ps.gz ${CAT} ${DISTDIR}/${DIST_SUBDIR}/pumma_refmanual.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/pumma_refmanual.ps.gz ${CAT} ${DISTDIR}/${DIST_SUBDIR}/scalapack_install.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/scalapack_install.ps.gz ${CAT} ${DISTDIR}/${DIST_SUBDIR}/scalapackqref.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/scalapackqref.ps.gz ${CAT} ${DISTDIR}/${DIST_SUBDIR}/trans.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/trans.ps.gz .endif .if defined(MAINTAINER_MODE) do-test: . if !exists(${HOME}/.mpd.conf) @${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${HOME}/.mpd.conf ${CHMOD} go-r ${HOME}/.mpd.conf @${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!" . endif ${LOCALBASE}/bin/mpd & (sleep 5 && cd ${BUILD_WRKSRC}/TESTING && ${MAKE_CMD} test) ${LOCALBASE}/bin/mpdallexit .endif .include Index: head/math/scalapack/files/pkg-message.in =================================================================== --- head/math/scalapack/files/pkg-message.in (revision 532421) +++ head/math/scalapack/files/pkg-message.in (revision 532422) @@ -1,37 +1,37 @@ [ { type: install message: <& ~/$i.log ? end % %%LOCALBASE%%/bin/mpdallexit If you're using OpenMPI, use this instead: % cd %%DATADIR%%/TESTING - % LD_LIBRARY_PATH=%%LOCALBASE%%/mpi/openmpi3/lib/ export LD_LIBRARY_PATH - % PATH=$PATH:%%LOCALBASE%%/mpi/openmpi3/bin/ export PATH + % LD_LIBRARY_PATH=%%LOCALBASE%%/mpi/openmpi/lib/ export LD_LIBRARY_PATH + % PATH=$PATH:%%LOCALBASE%%/mpi/openmpi/bin/ export PATH % mpirun -np 4 ./xcbrd % mpirun -np 4 ./xcdblu etc., etc. ... You can change -np 4 to any number to meet your environment. See files at %%DOCSDIR%% for detail. EOM } ]