From nobody Sat Jul 30 19:27:53 2022 X-Original-To: dev-commits-ports-all@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 4LwDtf1lTkz4XNnn; Sat, 30 Jul 2022 19:27:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LwDtf14slz3X3R; Sat, 30 Jul 2022 19:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659209274; 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=zMBaqkVNxrTSXXf2aSVj2f92t71yUkoBqMJhlvO8MRI=; b=bajd0aHZTOArLFNrYoo2Hb9pjGWhkZTHhC9+rctpvhpUq+Ij2vPncUU9Sj+vCu7yH39NEa 3QGQdrUrM9tE0btfmADmKE0+ZpzInY2CNz316HhaeerHOIxQAUiwUND/dSLJXYKLHUgh39 lAT336GMkEVBX2oR68qxGfzbyVqR/Onuj32MphhRt8lDJCtSVH8v/fvA6uiKzv2LUXhTwv IC0/fIveB4/3XUFhM0Ug1IafTL+d+r5yBlYiHeC0k5QBhN81S0ft5a9TFFguXiLpalgRCl HHLUvUIh+X6P7B6roeXel9bBWB7DEbFg1gYRjbOVRhTWNQPckSUZjxFePCxLCw== 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 4LwDtf0BdQzR1v; Sat, 30 Jul 2022 19:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26UJRrFe037014; Sat, 30 Jul 2022 19:27:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26UJRr6i037013; Sat, 30 Jul 2022 19:27:53 GMT (envelope-from git) Date: Sat, 30 Jul 2022 19:27:53 GMT Message-Id: <202207301927.26UJRr6i037013@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: edfea8b8d37e - main - science/pnetcdf: Fix build on i386 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: edfea8b8d37e65fc78f6a7191546cde0ef0e24cd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659209274; 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=zMBaqkVNxrTSXXf2aSVj2f92t71yUkoBqMJhlvO8MRI=; b=Djfw/kv8PSNgNuT75WxD8MidhWjfa/Rpm+vN0njdLuheJop2Lg1mnCic3oJSZadxFZpU3l aks62mzfXkdw/qxTD/IFAZss/jdcwI4ciH9nVKdDQoqTPZ0xgfUIyha4sfT5b2hRH7YEE7 xJKvfeLiPzHH2av4ymJpvCQ5AAuoqGPaMJML2yDFbn4eV/RQxZU9WL1Bx09Un2I3wFr7L3 0S1brjUV3nxc5XxxuB6TTe9ZKgVS1IBSILWG52alidpgdZI6InsFfNkiuAVTChiyfGRVmA 6HjIpJh9QRmGNMHFyKkitb6+18qXBl0BpYui14FyKu4ucSckgqTLvM8Ajwjp8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659209274; a=rsa-sha256; cv=none; b=MkeUV/YJ69mjhEM/1gshWa2eqDknonExwQiuAx6uz249PsHx2pnxVnc1i8kP1DOztMW+R7 AYpkk/0j64eBdemeFzme43uhi3OUj4eQBxQqkZhsqfIvvbEUpBufjPpP6V4ZT/+a1Cuvli KGlghPm2nZJFdmvAiNAm+Yglz/jpuKKKoAPXeCUctx5gWVAZZOX24XqKACkal+Cygj0e6Q 8Gqx0R7Re8zFrr2GCktdCpwnZmYZQAOIK2S/UHQ49n87tMmK5odv5FbmWUM2UudiujQXfH 9ZmI1AicWpcp06nzaL+GJpjPW0mMXpQrCA0YgLFEZtE6aeOkqW+cdGpU2UT1GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=edfea8b8d37e65fc78f6a7191546cde0ef0e24cd commit edfea8b8d37e65fc78f6a7191546cde0ef0e24cd Author: Po-Chuan Hsieh AuthorDate: 2022-07-30 19:24:09 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-07-30 19:24:09 +0000 science/pnetcdf: Fix build on i386 Use MPICH option for i386. PnetCDF requires MPI_Offset >= 8 but Open MPI sets MPI_Offset to 4 on 32-bit architecture regardless of LFS. See https://github.com/open-mpi/ompi/issues/3195 for details --- science/pnetcdf/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/science/pnetcdf/Makefile b/science/pnetcdf/Makefile index 3e0af9217aee..9990f1995913 100644 --- a/science/pnetcdf/Makefile +++ b/science/pnetcdf/Makefile @@ -19,7 +19,10 @@ CONFLICTS_INSTALL= hdf-4.* OPTIONS_SINGLE= MPI OPTIONS_SINGLE_MPI= OPENMPI MPICH -OPTIONS_DEFAULT=OPENMPI +OPTIONS_DEFAULT=${OPTIONS_DEFAULT_${ARCH}} +OPTIONS_DEFAULT_amd64= OPENMPI +OPTIONS_DEFAULT_i386= MPICH +#OPTIONS_DEFAULT=OPENMPI MPICH_USES= mpi:mpich OPENMPI_USES= mpi:openmpi @@ -31,6 +34,10 @@ OPENMPI_USES= mpi:openmpi FCFLAGS+= -fallow-argument-mismatch .endif +.if ${ARCH} == i386 && ${PORT_OPTIONS:MOPENMPI} +BROKEN= Use MPICH option instead. PnetCDF requires MPI_Offset >= 8 but Open MPI sets MPI_Offset to 4 on 32-bit architecture regardless of LFS. See https://github.com/open-mpi/ompi/issues/3195 for details +.endif + post-patch: @${REINPLACE_CMD} -e '/$$(INSTALL.*$$(PREFIX)/ s|$$(PREFIX)|$$(DESTDIR)&|' ${WRKSRC}/Makefile.in