From nobody Sun Aug 7 02:16:41 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 4M0jd53GZcz4YbCh; Sun, 7 Aug 2022 02:16:41 +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 4M0jd52s4gz3X5G; Sun, 7 Aug 2022 02:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659838601; 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=9D9CdX3WUxeGEfUGt6Zcnm0NZ+cfSvp8mOpt8yHNYl0=; b=mNzSfPbn/wCGEP/Wk6lTZZ7GDVQ6u8qS/QG1eFvyPGlzWl6IvFbN9MTMrtx0ig0xVuT5J7 mK+POtss4+plDb/uBl652KlZ44b5nf9pr9jSxR7puUr0AFz7UlKvBUuRxWFm/5nm3hZmuI D0PUXJ5Y5LZUvl584jQCsjr+Hur12MaP66Xwdhy+Jwmw7CXScMq0E4hXVblNFHPQtQdYld ja2ftCTmXLYhE2vyzc1QwMii8RzQYH9CNHsmpTDJdPnfZG+PywWEbiY7VW2AJhZWWClU5F RATnm2HugTEisB+VS0n5bAj3z/46x7oNFXYsdlt0w44WrD9gpgeKcAWSnl+GKw== 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 4M0jd51yHzzw7h; Sun, 7 Aug 2022 02:16:41 +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 2772GfWO071185; Sun, 7 Aug 2022 02:16:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2772Gf6D071184; Sun, 7 Aug 2022 02:16:41 GMT (envelope-from git) Date: Sun, 7 Aug 2022 02:16:41 GMT Message-Id: <202208070216.2772Gf6D071184@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: a43eddf7cd6d - main - science/pnetcdf: fix build on non amd64 / i386 architectures 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a43eddf7cd6d1f1ccf0991dbbff54ec9cc33a44c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659838601; 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=9D9CdX3WUxeGEfUGt6Zcnm0NZ+cfSvp8mOpt8yHNYl0=; b=saAy4ot4FWxoZ7UqTH2M8PGEgN+HYTG8x2bM6xUgbOe5O4/ZbgLbyoBJcQmWvVApbYWBvy x6rHfdUHF7sPgKcfqBvL4Tkfj1DMoC3Bz59IT22NFHzMROxT1m6tni35Rr//LDQwNqjmUe gWVEm//HkAj+Y2S/ngijE2llxMhXxmkjxznPzPLM5fSCRAp3j3hsE2uFF2L11pXaks1XwD QtfV1SlDm+mdzH073/3Xdwlx5ppQgFt7Vb5WuLVTGxNCFFi8BxtWwr+SfXthNZlDOS5HJO o1XGNMCnBJIBhd2v2D9y2ps+1cncZyER/flOBYsN2hmYMGxYd/hJOJ6CWBopCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659838601; a=rsa-sha256; cv=none; b=X7KoFXyR988QA3nEohge1YSLxQSCTn7nE3/27KCBJHyoK6/tfJlc1P/bdPGRYzLebifYRH JuLyWP62RIsRKy87k6tmRCSqvqgurR7SqCwfVfmP8mPmOdve9AM4yA7uy9+efqpGO+M0D+ opPNz1VXctmE/mce2zWK5buDDSg/koUiKzEnn0etjTcIJLtqt5cN7n9nhQI0/NInxfRZNf 3p+Dngn8oF/glUklhEGy7RtxSmEFMVPrn2lxjDLt4IwgF+74RK2/Gsnw0YuigxNPywB5xs cWP9GvDNIUAAoECgbDQ4Q5jxmiAcnkP+HXecJ3HJvBezqnNCSwG4IPm4/4PURQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=a43eddf7cd6d1f1ccf0991dbbff54ec9cc33a44c commit a43eddf7cd6d1f1ccf0991dbbff54ec9cc33a44c Author: Piotr Kubaj AuthorDate: 2022-08-07 02:14:13 +0000 Commit: Piotr Kubaj CommitDate: 2022-08-07 02:16:00 +0000 science/pnetcdf: fix build on non amd64 / i386 architectures 1. Set the default to OPENMPI on everywhere to fix: ====> You must select one and only one option from the MPI single =====> No option was selected (and one must be) 2. Then exclude it on other 32-bit architectures, not just i386. --- science/pnetcdf/Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/science/pnetcdf/Makefile b/science/pnetcdf/Makefile index 9990f1995913..bfa494405188 100644 --- a/science/pnetcdf/Makefile +++ b/science/pnetcdf/Makefile @@ -19,10 +19,15 @@ CONFLICTS_INSTALL= hdf-4.* OPTIONS_SINGLE= MPI OPTIONS_SINGLE_MPI= OPENMPI MPICH -OPTIONS_DEFAULT=${OPTIONS_DEFAULT_${ARCH}} -OPTIONS_DEFAULT_amd64= OPENMPI +OPTIONS_DEFAULT= OPENMPI +OPTIONS_DEFAULT_armv6= MPICH +OPTIONS_DEFAULT_armv7= MPICH OPTIONS_DEFAULT_i386= MPICH -#OPTIONS_DEFAULT=OPENMPI +OPTIONS_DEFAULT_powerpc= MPICH +OPTIONS_EXCLUDE_armv6= OPENMPI +OPTIONS_EXCLUDE_armv7= OPENMPI +OPTIONS_EXCLUDE_i386= OPENMPI +OPTIONS_EXCLUDE_powerpc= OPENMPI MPICH_USES= mpi:mpich OPENMPI_USES= mpi:openmpi @@ -34,7 +39,7 @@ OPENMPI_USES= mpi:openmpi FCFLAGS+= -fallow-argument-mismatch .endif -.if ${ARCH} == i386 && ${PORT_OPTIONS:MOPENMPI} +.if (${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc) && ${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