Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Aug 2024 03:00:23 GMT
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 347daa88a278 - 2024Q3 - math/fftw3: Convert OPENMPI option to USES=mpi
Message-ID:  <202408130300.47D30N0K070075@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2024Q3 has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=347daa88a2784417b84e9e6b71a426237eea5585

commit 347daa88a2784417b84e9e6b71a426237eea5585
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-08-13 02:43:10 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-08-13 03:00:02 +0000

    math/fftw3: Convert OPENMPI option to USES=mpi
    
    This should unbreak the OPENMPI option for 32-bit archs after
    0728e016e0ca.
    
    Reported by:    fluffy (via IRC)
    MFH:            2024Q3
    
    (cherry picked from commit 374eeee9e44fe97f4edb1f22485f280b96fe9789)
---
 math/fftw3/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 7c0a4919f051..121f7d7c0092 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -28,7 +28,6 @@ USE_PERL5=	build
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--enable-shared --enable-threads --disable-fortran
-MPIDIR?=	${LOCALBASE}/mpi/openmpi
 
 SHLIB_VER_MAJ=	${DISTVERSION:R:R}
 SHLIB_VER_MIN=	6
@@ -71,10 +70,10 @@ OPENMP_CONFIGURE_ENABLE=	openmp
 OPENMP_EXTRA_PATCHES=		${FILESDIR}/extrapatch-tests_fftw-bench.c
 
 OPENMPI_DESC=			Build OpenMPI parallel libraries
-OPENMPI_LIB_DEPENDS=		libmpi.so:net/openmpi
+OPENMPI_USES=			mpi:openmpi
 OPENMPI_CONFIGURE_ENABLE=	mpi
-OPENMPI_CONFIGURE_ENV=		MPICC=${MPIDIR}/bin/mpicc \
-				MPIRUN=${MPIDIR}/bin/mpirun
+OPENMPI_CONFIGURE_ENV=		MPICC=${MPICC} \
+				MPIRUN=${MPIRUN}
 
 .include <bsd.port.options.mk>
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408130300.47D30N0K070075>