From owner-svn-ports-all@freebsd.org Tue Apr 21 21:22:13 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 925002BB4A1; Tue, 21 Apr 2020 21:22:13 +0000 (UTC) (envelope-from danilo@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) server-signature RSA-PSS (4096 bits) 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 496Gjd2xzHz4F7P; Tue, 21 Apr 2020 21:22:13 +0000 (UTC) (envelope-from danilo@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 463FE7C3E; Tue, 21 Apr 2020 21:22:13 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03LLMDdW068636; Tue, 21 Apr 2020 21:22:13 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03LLMChP068635; Tue, 21 Apr 2020 21:22:12 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <202004212122.03LLMChP068635@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Tue, 21 Apr 2020 21:22:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r532422 - in head/math/scalapack: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danilo X-SVN-Commit-Paths: in head/math/scalapack: . files X-SVN-Commit-Revision: 532422 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.29 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: Tue, 21 Apr 2020 21:22:13 -0000 Author: danilo Date: Tue Apr 21 21:22:12 2020 New Revision: 532422 URL: https://svnweb.freebsd.org/changeset/ports/532422 Log: - Fix build with OpenMPI 4 and swap from net/openmpi3 to net/openmpi Modified: head/math/scalapack/Makefile head/math/scalapack/files/pkg-message.in Modified: head/math/scalapack/Makefile ============================================================================== --- head/math/scalapack/Makefile Tue Apr 21 21:09:11 2020 (r532421) +++ head/math/scalapack/Makefile Tue Apr 21 21:22:12 2020 (r532422) @@ -3,7 +3,7 @@ PORTNAME= scalapack PORTVERSION= 2.0.2 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= math MASTER_SITES= NL DISTFILES= scalapack-${PORTVERSION}.tgz manpages.tgz @@ -50,9 +50,9 @@ 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 @@ -69,8 +69,8 @@ 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 @@ -104,6 +104,14 @@ 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 Modified: head/math/scalapack/files/pkg-message.in ============================================================================== --- head/math/scalapack/files/pkg-message.in Tue Apr 21 21:09:11 2020 (r532421) +++ head/math/scalapack/files/pkg-message.in Tue Apr 21 21:22:12 2020 (r532422) @@ -24,8 +24,8 @@ 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. ...