From nobody Tue Aug 13 03:00:23 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WjbjM6Cwhz5S83N; Tue, 13 Aug 2024 03:00:23 +0000 (UTC) (envelope-from git@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjbjM5K3wz57fY; Tue, 13 Aug 2024 03:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723518023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s45MSthPeBHACgkQ5hZ88XcjhdsskL0agIurgg0rZ8k=; b=c4i+DPhz2WSOdN0lZwAmmdOpbuzA9730xVScpa9RUNAM6QgQW7G3xWS9+wa6D1ZDmhJ2e8 bu4QUSupNx/9YPjgZ5BMyNdl83kURT7JFqHGYdjmCt3YFgaQkEdFLqQ0ZX6X6gOr1/OA82 Q7bgKYiHVvX03xtNpsMMIgdwtZJ1Pjux1GJmwR4srPpvSQZUiO4IIzp0T0xJX0KcsIi3df K2l5+Ago17XVlPD7Qh06EWSbgFM350I6ByI8zDCmgD+cjUhhI5imNUzyrx6NQdYUrLn+3i 6dedt7YJfj7gBAi4LQCIXFJ1llCQCWr8o8KugQ1rgbzX9/PUqb1JEUgZ8IBTgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723518023; a=rsa-sha256; cv=none; b=EzXB8uJzPOmJGQ1oarhNWOkgf57dv5lHKWYMc1MkO5NgWPtiPoIu/VAu8urCl5iKvNSpFg Hj8EAJ6/P5m2vDlHlcf8SRjorZCmvM8ZEOi4wToDkYcIDG1Id7P8zeiWMtfgghvrNYpA0X TnXY46kQnbJ76nz7uo45hMgvOLJGvxSq16HAq+FgJDxjRr4hGdp65nyqS5ruqRS9/kOez/ oy0mFUQu2Tqg/WatWWFqCPB7qCyf/Cpt7FkflDcdRrvVq5UISfXpGr2XdFs6/oF8490WOI ZKYgQjf0dbvQ/0eu6jFrdFCSDdQsRu2U6uNlChi8Kn6tJ/o6zqxS1seYPu7n7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723518023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s45MSthPeBHACgkQ5hZ88XcjhdsskL0agIurgg0rZ8k=; b=HqhF93WDFGr8T6/LU5uLyNeFlTV3yVtFcbeTRgKzsTJnP4fZlY3k3NirgeE8PHXHFEdVDU EWPqXJvO3CIT9tGVlfTGqAtXDszkmVaqbzGXxWME47wATJEAdBuoVOpabUHxgfA0nntMYS p1t4e0wvyxG+F9j5tf/GiSrFQak67/AGqZ8i1nvM057M/S80OExLns0XplqhdpJXOn9oAk RtCYDWM2N/l6tXcl2qkidiCROAp2VVu8f7f/EYFiGxneWQ/1alTTS4BvcLh9Cw7VGOGSBl 4j7fmbHUUaVEeYBjUdKLqgj9FHpbvDmPMM4CHyNU77nQrlR5GX7vhEQo6kfAGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WjbjM4wf4ztBL; Tue, 13 Aug 2024 03:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47D30NiV070078; Tue, 13 Aug 2024 03:00:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47D30N0K070075; Tue, 13 Aug 2024 03:00:23 GMT (envelope-from git) Date: Tue, 13 Aug 2024 03:00:23 GMT Message-Id: <202408130300.47D30N0K070075@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Jason E. Hale" Subject: git: 347daa88a278 - 2024Q3 - math/fftw3: Convert OPENMPI option to USES=mpi List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 347daa88a2784417b84e9e6b71a426237eea5585 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=347daa88a2784417b84e9e6b71a426237eea5585 commit 347daa88a2784417b84e9e6b71a426237eea5585 Author: Jason E. Hale AuthorDate: 2024-08-13 02:43:10 +0000 Commit: Jason E. Hale 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