From nobody Tue Aug 13 02:59:17 2024 X-Original-To: dev-commits-ports-main@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 4Wjbh52ZwGz5S7m9; Tue, 13 Aug 2024 02:59:17 +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 4Wjbh51V1dz57XV; Tue, 13 Aug 2024 02:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723517957; 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=s3tOMpxyzouVAyTC5a+hJSuQc4DsYm/owRRO1X41GYI=; b=bVfTglKVoSIgw3BIkbO197o/67Pys3mcBUoaw+du34Fj0U+CDIOl0WYc9GE1OPDSVx8z/x HDrkLcLE57KWbyY8GNMSgYKIC4XuIJhtUy6dsvt3ev89ELdZ7mN+kkJ3xKtYpI8GI3+Chg 6s7ebCjt0/YYQewHF6/y5nzwi0qkxSh100skBXKIC/xpoewVC9kY8hoorAXkv27h8+uGkU X5wo+6aFMK/MNeUpoUF+9NkvNrFv0pSha5tLETJBlxRbeDqtg1tg5dfH/OnAHNGMS4L3Om Aq2hKJfQMZa68jj5OxxYpEZyROETULtkxrZF2768oVRR381vjsxFPVqkO1aIfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723517957; a=rsa-sha256; cv=none; b=Og2YCJrfDJUUf8QCzrgvnss0+TpckiUilGghdSmSsYjrkbz5PWxGNpizEpcK8SNFB3jQqQ 9uP4dRpMtkRY+GezOtqD++C0gbnkJgDVn8RQ5+mu6AIpi2DVn5p2sSPZFhz7IqSSQL8/x3 er3wix+4cAUJcqj+gXa206vD0FpmGAsCRCHlAp4zHp1OAoEJ/wVl63jRpdQQyYDLEV8h5G n+/KOU66gOybHSWvqSDPmGQN2YnT16yv1XMIJIPdsnN3N5KuMdqx4NvTAkIVpxRxAEvaar iynCdo+p0hdpiSsblDJQobv0OaCiJy6ylFpmBO4m6BrlterHGe5V0UC7WCy4gg== 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=1723517957; 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=s3tOMpxyzouVAyTC5a+hJSuQc4DsYm/owRRO1X41GYI=; b=j1es23UXATvUDV+CcJkZKLqEaX1YnYrRPYeWvh6JTyEkg0rVKkGdnn+iT+MSPAgc+gBSQi FfAD9dNyW1HBjWSkQXJZWDYFxrzspq3HHFIQrgsc7ya2m0tQFgKWx7whl7/ZlQwu2Ok0Iw Eued8FxrHzu7PakpkslA2tgJSuqYDwSQmMrDSTPBlTiqN8+gbkYqFvbyMNDaTU90iONkD4 mSeJxPdJnYtTfF+e3lV8b93h2gc38YMHmOdnlk123UQgiozzl18xOm93uvBf/80oX+85hS k0Hq/87XOoT5rmDWJR/XNGiomcqgHrDOxVL8pAP9mUvwd0cauFjob2SVDxMAaQ== 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 4Wjbh515ZQztdv; Tue, 13 Aug 2024 02:59:17 +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 47D2xHkC060144; Tue, 13 Aug 2024 02:59:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47D2xH18060141; Tue, 13 Aug 2024 02:59:17 GMT (envelope-from git) Date: Tue, 13 Aug 2024 02:59:17 GMT Message-Id: <202408130259.47D2xH18060141@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 374eeee9e44f - main - math/fftw3: Convert OPENMPI option to USES=mpi List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 374eeee9e44fe97f4edb1f22485f280b96fe9789 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=374eeee9e44fe97f4edb1f22485f280b96fe9789 commit 374eeee9e44fe97f4edb1f22485f280b96fe9789 Author: Jason E. Hale AuthorDate: 2024-08-13 02:43:10 +0000 Commit: Jason E. Hale CommitDate: 2024-08-13 02:59:03 +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 --- 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