Date: Sat, 23 Aug 2014 08:58:24 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365717 - in head/math/blacs: . files Message-ID: <201408230858.s7N8wOQg088183@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Sat Aug 23 08:58:23 2014 New Revision: 365717 URL: http://svnweb.freebsd.org/changeset/ports/365717 QAT: https://qat.redports.org/buildarchive/r365717/ Log: - Make fetchable again - Stagify - Link the test programs with FFLAGS to get -rpath on GCC libs. Modified: head/math/blacs/Makefile head/math/blacs/distinfo head/math/blacs/files/Bmake.inc-mpich.diff head/math/blacs/files/Bmake.inc-openmpi.diff Modified: head/math/blacs/Makefile ============================================================================== --- head/math/blacs/Makefile Sat Aug 23 08:31:07 2014 (r365716) +++ head/math/blacs/Makefile Sat Aug 23 08:58:23 2014 (r365717) @@ -3,15 +3,12 @@ PORTNAME= blacs PORTVERSION= 1.7 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= math -MASTER_SITES= ftp://ftp.netlib.org/blacs/ +MASTER_SITES= ${MASTER_SITE_NETLIB} +MASTER_SITE_SUBDIR=blacs DISTNAME= BLACS DISTFILES= mpiblacs.tgz blacstester.tgz mpiblacs-patch03.tgz -.if !defined(NOPORTDOCS) -DISTFILES+= blacs_install.ps f77blacsqref.ps lawn94.ps \ - cblacsqref.ps mpi_prop.ps mpiblacs_issues.ps -.endif DIST_SUBDIR= blacs EXTRACT_ONLY= mpiblacs.tgz blacstester.tgz mpiblacs-patch03.tgz @@ -23,9 +20,13 @@ SUB_FILES= pkg-message USES= fortran gmake USE_LDCONFIG= yes -NO_STAGE= yes .include <bsd.port.pre.mk> +.if ! ${PORT_OPTIONS:MDOCS} +DISTFILES+= blacs_install.ps f77blacsqref.ps lawn94.ps \ + cblacsqref.ps mpi_prop.ps mpiblacs_issues.ps +.endif + .if exists(${LOCALBASE}/mpi/openmpi/bin/mpirun) WITH_OPENMPI= yes .endif @@ -50,7 +51,7 @@ FPIC= -fpic WRKSRC_SHARED=${WRKSRC}_shared CFLAGS_SHARED=${CFLAGS} ${FPIC} -FFLAGS_SHARED=${CFLAGS} ${FPIC} +FFLAGS_SHARED=${FFLAGS} ${FPIC} SVERSION=1 .if defined(WITH_OPTIMIZED_FLAGS) @@ -95,37 +96,34 @@ post-build: done do-install: - ${INSTALL_DATA} ${WRKSRC}/LIB/blacsCinit_MPI-FreeBSD-${DEBUG_LEVEL}.a ${PREFIX}/lib/libblacsc.a - ${INSTALL_DATA} ${WRKSRC}/LIB/blacsF77init_MPI-FreeBSD-${DEBUG_LEVEL}.a ${PREFIX}/lib/libblacsf77.a - ${INSTALL_DATA} ${WRKSRC}/LIB/blacs_MPI-FreeBSD-${DEBUG_LEVEL}.a ${PREFIX}/lib/libblacs.a - - ${INSTALL_DATA} ${WRKDIR}/tmp_shared/libblacsc.so.${SVERSION} ${PREFIX}/lib/libblacsc.so.${SVERSION} - ${INSTALL_DATA} ${WRKDIR}/tmp_shared/libblacsf77.so.${SVERSION} ${PREFIX}/lib/libblacsf77.so.${SVERSION} - ${INSTALL_DATA} ${WRKDIR}/tmp_shared/libblacs.so.${SVERSION} ${PREFIX}/lib/libblacs.so.${SVERSION} - - ${INSTALL_DATA} ${WRKDIR}/tmp_shared/libblacsc.so ${PREFIX}/lib/libblacsc.so - ${INSTALL_DATA} ${WRKDIR}/tmp_shared/libblacsf77.so ${PREFIX}/lib/libblacsf77.so - ${INSTALL_DATA} ${WRKDIR}/tmp_shared/libblacs.so ${PREFIX}/lib/libblacs.so + ${INSTALL_DATA} ${WRKSRC}/LIB/blacsCinit_MPI-FreeBSD-${DEBUG_LEVEL}.a ${STAGEDIR}${PREFIX}/lib/libblacsc.a + ${INSTALL_DATA} ${WRKSRC}/LIB/blacsF77init_MPI-FreeBSD-${DEBUG_LEVEL}.a ${STAGEDIR}${PREFIX}/lib/libblacsf77.a + ${INSTALL_DATA} ${WRKSRC}/LIB/blacs_MPI-FreeBSD-${DEBUG_LEVEL}.a ${STAGEDIR}${PREFIX}/lib/libblacs.a + + ${INSTALL_DATA} ${WRKDIR}/tmp_shared/libblacsc.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/libblacsc.so.${SVERSION} + ${INSTALL_DATA} ${WRKDIR}/tmp_shared/libblacsf77.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/libblacsf77.so.${SVERSION} + ${INSTALL_DATA} ${WRKDIR}/tmp_shared/libblacs.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/libblacs.so.${SVERSION} + + ${INSTALL_DATA} ${WRKDIR}/tmp_shared/libblacsc.so ${STAGEDIR}${PREFIX}/lib/libblacsc.so + ${INSTALL_DATA} ${WRKDIR}/tmp_shared/libblacsf77.so ${STAGEDIR}${PREFIX}/lib/libblacsf77.so + ${INSTALL_DATA} ${WRKDIR}/tmp_shared/libblacs.so ${STAGEDIR}${PREFIX}/lib/libblacs.so - ${MKDIR} ${PREFIX}/share/BLACS/TESTING + ${MKDIR} ${STAGEDIR}${PREFIX}/share/BLACS/TESTING ( cd ${WRKSRC_SHARED}/TESTING/EXE ; \ - ${INSTALL_PROGRAM} xCbtest_MPI-FreeBSD-${DEBUG_LEVEL} ${PREFIX}/share/BLACS/TESTING/xCbtest_MPI-FreeBSD; \ - ${INSTALL_PROGRAM} xFbtest_MPI-FreeBSD-${DEBUG_LEVEL} ${PREFIX}/share/BLACS/TESTING/xFbtest_MPI-FreeBSD; \ - ${INSTALL_DATA} bsbr.dat ${PREFIX}/share/BLACS/TESTING; \ - ${INSTALL_DATA} bt.dat ${PREFIX}/share/BLACS/TESTING; \ - ${INSTALL_DATA} comb.dat ${PREFIX}/share/BLACS/TESTING; \ - ${INSTALL_DATA} sdrv.dat ${PREFIX}/share/BLACS/TESTING) -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${CAT} ${DISTDIR}/${DIST_SUBDIR}/blacs_install.ps | ${GZIP_CMD} > ${DOCSDIR}/blacs_install.ps.gz - ${CAT} ${DISTDIR}/${DIST_SUBDIR}/cblacsqref.ps | ${GZIP_CMD} > ${DOCSDIR}/cblacsqref.ps.gz - ${CAT} ${DISTDIR}/${DIST_SUBDIR}/f77blacsqref.ps | ${GZIP_CMD} > ${DOCSDIR}/f77blacsqref.ps.gz - ${CAT} ${DISTDIR}/${DIST_SUBDIR}/lawn94.ps | ${GZIP_CMD} > ${DOCSDIR}/lawn94.ps.gz - ${CAT} ${DISTDIR}/${DIST_SUBDIR}/mpi_prop.ps | ${GZIP_CMD} > ${DOCSDIR}/mpi_prop.ps.gz - ${CAT} ${DISTDIR}/${DIST_SUBDIR}/mpiblacs_issues.ps | ${GZIP_CMD} > ${DOCSDIR}/mpiblacs_issues.ps.gz + ${INSTALL_PROGRAM} xCbtest_MPI-FreeBSD-${DEBUG_LEVEL} ${STAGEDIR}${PREFIX}/share/BLACS/TESTING/xCbtest_MPI-FreeBSD; \ + ${INSTALL_PROGRAM} xFbtest_MPI-FreeBSD-${DEBUG_LEVEL} ${STAGEDIR}${PREFIX}/share/BLACS/TESTING/xFbtest_MPI-FreeBSD; \ + ${INSTALL_DATA} bsbr.dat ${STAGEDIR}${PREFIX}/share/BLACS/TESTING; \ + ${INSTALL_DATA} bt.dat ${STAGEDIR}${PREFIX}/share/BLACS/TESTING; \ + ${INSTALL_DATA} comb.dat ${STAGEDIR}${PREFIX}/share/BLACS/TESTING; \ + ${INSTALL_DATA} sdrv.dat ${STAGEDIR}${PREFIX}/share/BLACS/TESTING) +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${CAT} ${DISTDIR}/${DIST_SUBDIR}/blacs_install.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/blacs_install.ps.gz + ${CAT} ${DISTDIR}/${DIST_SUBDIR}/cblacsqref.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/cblacsqref.ps.gz + ${CAT} ${DISTDIR}/${DIST_SUBDIR}/f77blacsqref.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/f77blacsqref.ps.gz + ${CAT} ${DISTDIR}/${DIST_SUBDIR}/lawn94.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/lawn94.ps.gz + ${CAT} ${DISTDIR}/${DIST_SUBDIR}/mpi_prop.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/mpi_prop.ps.gz + ${CAT} ${DISTDIR}/${DIST_SUBDIR}/mpiblacs_issues.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/mpiblacs_issues.ps.gz .endif -post-install: - @${CAT} ${PKGMESSAGE} - .include <bsd.port.post.mk> Modified: head/math/blacs/distinfo ============================================================================== --- head/math/blacs/distinfo Sat Aug 23 08:31:07 2014 (r365716) +++ head/math/blacs/distinfo Sat Aug 23 08:58:23 2014 (r365717) @@ -1,5 +1,5 @@ -SHA256 (blacs/mpiblacs.tgz) = b56bcfc7c4cd6baefa314fd0e85d877eb11afda1641dd7ebb0b96c7f802f3b72 -SIZE (blacs/mpiblacs.tgz) = 74123 +SHA256 (blacs/mpiblacs.tgz) = 88dd7265d412022948debb7a2737226cd53a3bf73b0b62fc55ceb3ccc8a598f7 +SIZE (blacs/mpiblacs.tgz) = 152823 SHA256 (blacs/blacstester.tgz) = 7e5a67b703f74f05435055dd314a7196007d9a273e6bb46058a19be71d3ba197 SIZE (blacs/blacstester.tgz) = 81937 SHA256 (blacs/mpiblacs-patch03.tgz) = 92dfba8a462a2f23102000a10532c00a9a5203b79ccad5a87f44ce83eb6bc7ed Modified: head/math/blacs/files/Bmake.inc-mpich.diff ============================================================================== --- head/math/blacs/files/Bmake.inc-mpich.diff Sat Aug 23 08:31:07 2014 (r365716) +++ head/math/blacs/files/Bmake.inc-mpich.diff Sat Aug 23 08:58:23 2014 (r365717) @@ -1,5 +1,5 @@ ---- Bmake.inc.orig Mon May 5 10:53:00 2003 -+++ Bmake.inc Mon May 5 10:58:38 2003 +--- Bmake.inc.orig 2000-02-25 01:22:28.000000000 +0100 ++++ Bmake.inc 2014-08-22 23:50:32.000000000 +0200 @@ -13,7 +13,7 @@ # ----------------------------- # The top level BLACS directory @@ -39,6 +39,15 @@ # ------------------------------------- # All libraries required by the tester. +@@ -93,7 +93,7 @@ + # setting for your platform, compile and run BLACS/INSTALL/xintface. + # Choices are: Add_, NoChange, UpCase, or f77IsF2C. + # --------------------------------------------------------------------------- +- INTFACE = -Df77IsF2C ++ INTFACE = -DAdd_ + + # ------------------------------------------------------------------------ + # Allows the user to vary the topologies that the BLACS default topologies @@ -195,16 +195,15 @@ # optimization. This is the F77NO_OPTFLAG. The usage of the remaining # macros should be obvious from the names. @@ -47,13 +56,14 @@ - F77NO_OPTFLAGS = - F77FLAGS = $(F77NO_OPTFLAGS) -O - F77LOADER = $(F77) +- F77LOADFLAGS = +- CC = gcc +- CCFLAGS = -O4 + F77 = @F77@ + F77NO_OPTFLAGS = @F77EXTRAFLAGS@ + F77FLAGS = @FFLAGS@ + F77LOADER = @F77@ - F77LOADFLAGS = -- CC = gcc -- CCFLAGS = -O4 ++ F77LOADFLAGS = @FFLAGS@ + CC = @CC@ + CCFLAGS = @CFLAGS@ CCLOADER = $(CC) @@ -62,14 +72,3 @@ # -------------------------------------------------------------------------- # The archiver and the flag(s) to use when building an archive (library). # Also the ranlib routine. If your system has no ranlib, set RANLIB = echo. ---- Bmake.inc~ Wed Jan 10 16:11:00 2007 -+++ Bmake.inc Wed Jan 10 16:18:08 2007 -@@ -93,7 +93,7 @@ - # setting for your platform, compile and run BLACS/INSTALL/xintface. - # Choices are: Add_, NoChange, UpCase, or f77IsF2C. - # --------------------------------------------------------------------------- -- INTFACE = -Df77IsF2C -+ INTFACE = -DAdd_ - - # ------------------------------------------------------------------------ - # Allows the user to vary the topologies that the BLACS default topologies Modified: head/math/blacs/files/Bmake.inc-openmpi.diff ============================================================================== --- head/math/blacs/files/Bmake.inc-openmpi.diff Sat Aug 23 08:31:07 2014 (r365716) +++ head/math/blacs/files/Bmake.inc-openmpi.diff Sat Aug 23 08:58:23 2014 (r365717) @@ -1,5 +1,5 @@ ---- Bmake.inc.orig Mon Nov 13 14:17:35 2006 -+++ Bmake.inc Mon Nov 13 14:19:18 2006 +--- Bmake.inc.orig 2014-08-22 23:54:21.000000000 +0200 ++++ Bmake.inc 2014-08-22 23:55:10.000000000 +0200 @@ -13,7 +13,7 @@ # ----------------------------- # The top level BLACS directory @@ -66,14 +66,15 @@ - F77NO_OPTFLAGS = - F77FLAGS = $(F77NO_OPTFLAGS) -O - F77LOADER = $(F77) +- F77LOADFLAGS = +- CC = gcc +- CCFLAGS = -O4 +- CCLOADER = $(CC) + F77 = @LOCALBASE@/mpi/openmpi/bin/mpif77 + F77NO_OPTFLAGS = @F77EXTRAFLAGS@ + F77FLAGS = @FFLAGS@ + F77LOADER = @LOCALBASE@/mpi/openmpi/bin/mpif77 - F77LOADFLAGS = -- CC = gcc -- CCFLAGS = -O4 -- CCLOADER = $(CC) ++ F77LOADFLAGS = @FFLAGS@ + CC = @LOCALBASE@/mpi/openmpi/bin/mpicc + CCFLAGS = @CFLAGS@ + CCLOADER = @LOCALBASE@/mpi/openmpi/bin/mpicc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408230858.s7N8wOQg088183>