From owner-svn-ports-all@freebsd.org Sun Jun 14 09:14:23 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 14CDD3345CC; Sun, 14 Jun 2020 09:14:23 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49l80t6sLtz48yy; Sun, 14 Jun 2020 09:14:22 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E6C1DA03D; Sun, 14 Jun 2020 09:14:22 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05E9EMmh001489; Sun, 14 Jun 2020 09:14:22 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05E9EMIl001485; Sun, 14 Jun 2020 09:14:22 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <202006140914.05E9EMIl001485@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Sun, 14 Jun 2020 09:14:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538717 - in head/math/mumps: . files X-SVN-Group: ports-head X-SVN-Commit-Author: thierry X-SVN-Commit-Paths: in head/math/mumps: . files X-SVN-Commit-Revision: 538717 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jun 2020 09:14:23 -0000 Author: thierry Date: Sun Jun 14 09:14:21 2020 New Revision: 538717 URL: https://svnweb.freebsd.org/changeset/ports/538717 Log: Switch from mpich2 to mpich. Modified: head/math/mumps/Makefile head/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.PAR head/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.SEQ head/math/mumps/files/patch-PORD_lib_Makefile Modified: head/math/mumps/Makefile ============================================================================== --- head/math/mumps/Makefile Sun Jun 14 09:14:03 2020 (r538716) +++ head/math/mumps/Makefile Sun Jun 14 09:14:21 2020 (r538717) @@ -3,6 +3,7 @@ PORTNAME= mumps DISTVERSION= 5.1.2-aster6 +PORTREVISION= 1 CATEGORIES= math PKGNAMESUFFIX= -edf @@ -14,15 +15,11 @@ LICENSE_NAME= CeCILL-C LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LIB_DEPENDS= libblas.so:math/blas \ - liblapack.so:math/lapack \ - libmetis.so:math/metis +LIB_DEPENDS= libmetis.so:math/metis -USES= fortran +USES= blaslapack fortran WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} -BLAS_LIBS= -lblas -LAPACK_LIBS= -llapack FORTRANLIBS= -lgfortran GCCLIBDIR= ${LDFLAGS} USE_LDCONFIG= yes @@ -31,8 +28,17 @@ MUMPSVERSION= ${PORTVERSION:R} LIBS= cmumps dmumps mumps_common pord smumps zmumps PLIST_SUB= VE=${VEM} MUMPSVERSION=${MUMPSVERSION} -OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_DEFINE= DOCS EXAMPLES MPI +MPI_BUILD_DEPENDS_OFF= ${LOCALBASE}/lib/libscotch.a:cad/scotch +MPI_BUILD_DEPENDS= ${LOCALBASE}/lib/libptscotch.a:cad/scotch +MPI_LIB_DEPENDS= libmpi.so:net/mpich \ + libparmetis.so:math/parmetis \ + libscalapack.so:math/scalapack +MPI_PLIST_SUB= WITH_LIBSEQ="@comment " +MPI_PLIST_SUB_OFF= WITH_LIBSEQ="" +MPI_LIBS_OFF= mpiseq + MAKE_JOBS_UNSAFE=yes .include @@ -40,31 +46,17 @@ MAKE_JOBS_UNSAFE=yes .ifdef WITH_MPI PKGNAMESUFFIX+= -mpich -BUILD_DEPENDS+= ${LOCALBASE}/include/mpif.h:net/mpich2 \ - ${LOCALBASE}/lib/libblacs.a:math/blacs \ - ${LOCALBASE}/lib/libptscotch.a:cad/scotch \ - ${LOCALBASE}/lib/libscalapack.a:math/scalapack \ - ${LOCALBASE}/lib/parmetis/libmetis.a:math/parmetis -LIB_DEPENDS+= liblapack.so:math/lapack -# Note: -l?mumps still requires to be linked with -lblacs + -lscalapack -RUN_DEPENDS+= ${LOCALBASE}/bin/mpirun:net/mpich2 \ - ${LOCALBASE}/lib/libblacs.a:math/blacs \ - ${LOCALBASE}/lib/libscalapack.a:math/scalapack -PLIST_SUB+= WITH_LIBSEQ="@comment " -.else -BUILD_DEPENDS+= ${LOCALBASE}/lib/libscotch.a:cad/scotch -PLIST_SUB+= WITH_LIBSEQ="" -LIBS+= mpiseq .endif -pre-configure: -.ifdef WITH_MPI +post-patch-MPI-on: ${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.FREEBSD10.PAR \ ${WRKSRC}/Makefile.inc -.else + +post-patch-MPI-off: ${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.FREEBSD10.SEQ \ ${WRKSRC}/Makefile.inc -.endif + +pre-configure: ${DIRNAME} `${FC} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR .for MF in Makefile Makefile.inc PORD/lib/Makefile libseq/Makefile src/Makefile ${REINPLACE_CMD} -e 's+@CC@+${CC}+g ; s+@FC@+${FC}+g ; \ @@ -74,8 +66,8 @@ pre-configure: s+@SOVER@+${VEM}+g; \ s+@GCCLIBDIR@+${GCCLIBDIR}+g; \ s+@FORTRANLIBS@+${FORTRANLIBS}+g; \ - s+@BLAS_LIBS@+${BLAS_LIBS}+ ; \ - s+@LAPACK_LIBS@+${LAPACK_LIBS}+ ; \ + s+@BLAS_LIBS@+${BLASLIB}+ ; \ + s+@LAPACK_LIBS@+${LAPACKLIB}+ ; \ s+@LOCALBASE@+${LOCALBASE}+g;' \ ${WRKSRC}/${MF} .endfor @@ -84,10 +76,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/lib/lib*.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/lib/lib*.so.${VEM} ${STAGEDIR}${PREFIX}/lib -.ifndef WITH_MPI - ${INSTALL_DATA} ${WRKSRC}/libseq/libmpiseq.a ${STAGEDIR}${PREFIX}/lib - ${INSTALL_LIB} ${WRKSRC}/libseq/libmpiseq*.so.${VEM} ${STAGEDIR}${PREFIX}/lib -.endif .for lib in ${LIBS} (cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf lib${lib}.so.${VEM} ${STAGEDIR}${PREFIX}/lib/lib${lib}.so) . endfor @@ -101,6 +89,10 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/examples/${ex} ${STAGEDIR}${EXAMPLESDIR} . endfor +do-install-MPI-off: + ${INSTALL_DATA} ${WRKSRC}/libseq/libmpiseq.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_LIB} ${WRKSRC}/libseq/libmpiseq*.so.${VEM} ${STAGEDIR}${PREFIX}/lib + regression-test: install .if defined (WITH_MPI) && defined(MAINTAINER_MODE) . if !exists(${HOME}/.mpd.conf) @@ -108,7 +100,6 @@ regression-test: install ${CHMOD} go-r ${HOME}/.mpd.conf @${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!" . endif - ${LOCALBASE}/bin/mpd & (cd ${WRKSRC}/examples && \ ${LOCALBASE}/bin/mpirun -np 2 ./ssimpletest < input_simpletest_real ; \ ${LOCALBASE}/bin/mpirun -np 2 ./dsimpletest < input_simpletest_real ; \ @@ -117,7 +108,6 @@ regression-test: install ${ECHO_MSG} "The solution should be (1,2,3,4,5)" ; \ ${LOCALBASE}/bin/mpirun -np 3 ./c_example ; \ ${ECHO_MSG} "The solution should be (1,2)") - ${LOCALBASE}/bin/mpdallexit .else (cd ${WRKSRC}/examples && \ ./ssimpletest < input_simpletest_real ; \ Modified: head/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.PAR ============================================================================== --- head/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.PAR Sun Jun 14 09:14:03 2020 (r538716) +++ head/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.PAR Sun Jun 14 09:14:21 2020 (r538717) @@ -1,4 +1,4 @@ ---- Make.inc/Makefile.FREEBSD10.PAR.orig 2017-08-08 07:32:58 UTC +--- Make.inc/Makefile.FREEBSD10.PAR.orig 2019-04-03 14:40:12 UTC +++ Make.inc/Makefile.FREEBSD10.PAR @@ -20,7 +20,7 @@ # @@ -39,7 +39,7 @@ # The following variables will be used in the compilation process. # Please note that -Dptscotch and -Dparmetis imply -Dscotch and -Dmetis respectively. -@@ -66,34 +66,34 @@ IORDERINGSC = $(IMETIS) $(IPORD) $(ISCOT +@@ -66,34 +66,34 @@ IORDERINGSC = $(IMETIS) $(IPORD) $(ISCOTCH) PLAT = LIBEXT = .a @@ -60,7 +60,7 @@ RANLIB = ranlib LAPACK = -llapack -SCALAP = -lscalapack -lblacs -+SCALAP = -L@LOCALBASE@/lib -lblacs -lblacsc -lblacsf77 -lscalapack ++SCALAP = -L@LOCALBASE@/lib -lscalapack -lexecinfo INCPAR = -I/usr/local/include -LIBPAR = $(SCALAP) $(LAPACK) -L/usr/local/lib -lmpi @@ -85,5 +85,5 @@ -OPTC = -O -I. #-fopenmp +OPTC = @CFLAGS@ -I. #-fopenmp #End Optimized options - INCS = $(INCPAR) - LIBS = $(LIBPAR) + + Modified: head/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.SEQ ============================================================================== --- head/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.SEQ Sun Jun 14 09:14:03 2020 (r538716) +++ head/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.SEQ Sun Jun 14 09:14:21 2020 (r538717) @@ -1,4 +1,4 @@ ---- Make.inc/Makefile.FREEBSD10.SEQ.orig 2017-08-08 07:32:58 UTC +--- Make.inc/Makefile.FREEBSD10.SEQ.orig 2019-04-03 14:40:12 UTC +++ Make.inc/Makefile.FREEBSD10.SEQ @@ -20,7 +20,7 @@ # @@ -29,7 +29,7 @@ #LMETIS = -L$(LMETISDIR) -lparmetis -lmetis # The following variables will be used in the compilation process. -@@ -66,14 +66,14 @@ IORDERINGSC = $(IMETIS) $(IPORD) $(ISCOT +@@ -66,14 +66,14 @@ IORDERINGSC = $(IMETIS) $(IPORD) $(ISCOTCH) PLAT = LIBEXT = .a @@ -69,5 +69,5 @@ -OPTC = -O -I. #-fopenmp +OPTC = @CFLAGS@ -I. #-fopenmp #End Optimized options - INCS = $(INCSEQ) - LIBS = $(LIBSEQ) + + Modified: head/math/mumps/files/patch-PORD_lib_Makefile ============================================================================== --- head/math/mumps/files/patch-PORD_lib_Makefile Sun Jun 14 09:14:03 2020 (r538716) +++ head/math/mumps/files/patch-PORD_lib_Makefile Sun Jun 14 09:14:21 2020 (r538717) @@ -1,6 +1,6 @@ ---- PORD/lib/Makefile.orig 2017-08-08 07:32:58 UTC +--- PORD/lib/Makefile.orig 2019-04-03 14:40:12 UTC +++ PORD/lib/Makefile -@@ -22,12 +22,17 @@ OBJS = graph.o gbipart.o gbisect.o ddcre +@@ -22,11 +22,16 @@ OBJS = graph.o gbipart.o gbisect.o ddcreate.o ddbisect # OUTC = -o .c.o: @@ -14,10 +14,9 @@ +libpord$(LIBEXT): $(OBJS) + $(AR) $@ $(OBJS) $(RANLIB) $@ - ++ +libpord.so.@SOVER@: $(OBJS) + $(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT).so.@SOVER@ -o libpord$(PLAT).so.@SOVER@ -+ + clean: rm -f *.o -