From nobody Sat Mar 23 14:58:39 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 4V22Q81cmTz5F84s; Sat, 23 Mar 2024 14:58:40 +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 4V22Q75LKSz3wl2; Sat, 23 Mar 2024 14:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711205919; 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=scVtexD7n3vyKudQForWLU+OBndvcLtFje9MSifiZhU=; b=vW/xrnQdkAfmMmClVbIFcajPTvVgTG2653rWeh99dLB5WM23tIFT3qxOWhJyY2dMRiHJRO ZZawS88odLuq9IcgEFZAf5H6u2Cp9EqvyLENREhRTLCElpn/rou/uFe5Stja9VwhM6TmSC jOBVIHZgUgbsY+tgsJsoCLi60wwlypNJeBGwPXMI6z9rVrr+yB95C2do7PwMefHS0sLxRW frK1gu6EsZyJcCQ+5zG/nsejcy7ySo7tp9AgVemfWfdcq0JsMrnjx0xnXpPJiIFyyvFeLr 8iDdGBVWqVUtn0Cn9GmW1/xRoHyaCCCB3+Ax44IMuoYJfFGX8mQ/B4mF6AiUHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711205919; a=rsa-sha256; cv=none; b=GbObS2yODzzLiuv42X03kQcv1h9WYfi90YRd6AkMp1G8sWGN/wlVwc5Su0E3caXyLjPWpf MJDG6I76hoLXvBqeyBRFO5I+xOPuA2YqGl/ShlfsNjFxdyGQZ57T4B0zULnGMl2itnGJBh iP6oGvTkWI/SUZo9o4mVsn+zilDR/97KtwO2E86Hm34r5DrTzFAGxNgRCCZsnsqMoOKxpB Kcn8LEhPrZdsx8YPPD8rFLyk8uquuiP0i1KeuAxz+QF1o44A7JPdQq0M9uy/wKNiqvNNth wS3JRdv1AzxtbQmxEjz9shwX/gcGSMw+FBSutJd9fzJP/fSJ+mpTAOy4vVN5bw== 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=1711205919; 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=scVtexD7n3vyKudQForWLU+OBndvcLtFje9MSifiZhU=; b=k8uTZTuD0gIi+dH2O/UmVKCBt+c1PEobTPgRB+j4fCCnq03BSlB2zjR/5v5pM6tDw5WyN8 K3UazqQN3rmZE5DctQY+6cg0wtJC9gznNZkB+rNNxTecAGOvQuafB4xQKjwCMwTjFP1XA5 SJRLKxD6xgFCx42HzzkmWbA0wYehI+58PQAsVFx7CHL0b8bavUvzzklkqMMGdIsRvCMqSY 0PuFQsEoDJ1g4CSpDpbQYlfSZ55CeS3B/o9BEl4CtV4AbG+wrQzTOzayGk7kkPVWPOEepY w4HfNihovS6qkXDLt3KXhKELGNr84kg1SFPXOe1MeiXK/CbwWlF8fHYADw1plw== 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 4V22Q74tfNzt3l; Sat, 23 Mar 2024 14:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42NEwdx6085932; Sat, 23 Mar 2024 14:58:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42NEwdUm085929; Sat, 23 Mar 2024 14:58:39 GMT (envelope-from git) Date: Sat, 23 Mar 2024 14:58:39 GMT Message-Id: <202403231458.42NEwdUm085929@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: 307bccbbf84b - main - science/pnetcdf: Clean up Makefile 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 307bccbbf84bc31b733d653a615db8e4463b0453 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=307bccbbf84bc31b733d653a615db8e4463b0453 commit 307bccbbf84bc31b733d653a615db8e4463b0453 Author: Po-Chuan Hsieh AuthorDate: 2024-03-23 14:18:56 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-03-23 14:30:47 +0000 science/pnetcdf: Clean up Makefile --- science/pnetcdf/Makefile | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/science/pnetcdf/Makefile b/science/pnetcdf/Makefile index 20efb8a90604..de328531fed6 100644 --- a/science/pnetcdf/Makefile +++ b/science/pnetcdf/Makefile @@ -15,6 +15,8 @@ USE_PERL5= build CFLAGS+= -fPIC CONFIGURE_ARGS= --with-mpi=${MPI_HOME} ac_cv_fc_compiler_nag=no +# Workaround for GCC 10+ for Type mismatch between actual argument at (1) and actual argument at (2) (INTEGER(8)/CHARACTER(*)). +FCFLAGS+= -fallow-argument-mismatch GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share MAKE_JOBS_UNSAFE= yes @@ -24,6 +26,9 @@ CONFLICTS_INSTALL= hdf-4.* OPTIONS_SINGLE= MPI OPTIONS_SINGLE_MPI= OPENMPI MPICH OPTIONS_DEFAULT=OPENMPI +# Use Use MPICH option for 32-bit architecture. +# 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. OPTIONS_DEFAULT_armv6= MPICH OPTIONS_DEFAULT_armv7= MPICH OPTIONS_DEFAULT_i386= MPICH @@ -36,15 +41,4 @@ OPTIONS_EXCLUDE_powerpc=OPENMPI MPICH_USES= mpi:mpich OPENMPI_USES= mpi:openmpi -.include - -.if ${GCC_DEFAULT} >= 10 -# Workaround for Type mismatch between actual argument at (1) and actual argument at (2) (INTEGER(8)/CHARACTER(*)). -FCFLAGS+= -fallow-argument-mismatch -.endif - -.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 - -.include +.include