From nobody Tue Nov 1 18:54:50 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 4N1zj65YR0z4h2Wf; Tue, 1 Nov 2022 18:54:50 +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 4N1zj64yFZz4JGM; Tue, 1 Nov 2022 18:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667328890; 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=KNIbrgmh00KyrZTzEHobFF8Uc1tIleLQbZrpIiBzSTo=; b=X5IJ4tPntfgWVtA0omKMSwl6Iik66DB/LOOn9vh/mHZ/QkUH+aQo2eR8zetpfWpw3oWnL1 ngFVEAawklXwAZ6kohyXbmK0z7GKdM5HQj7FZ9mNEduq4JnWozxduXFP3QkVJlnVJB9RO7 Lnp9ltLh7dMQrn527PV0hwKgOv5rtCmGZrYYQRyzKpzULqwR5VBVZ/iWxLuXKWEhGh8/k8 WDC41Vl/Wmv+cK+g1v5UMlRZH8zjNUXJafTTGTtMetKm3Oa4qezdD85hc84rv3Y8mskb/O KnCEf34vqN0/JV8dtjfUD386OZMQGG/oIR0k5CTNdQQL4T005orouCX1XZa+ZA== 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 4N1zj6414wzRXN; Tue, 1 Nov 2022 18:54:50 +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 2A1IsoEh084647; Tue, 1 Nov 2022 18:54:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A1IsoUq084646; Tue, 1 Nov 2022 18:54:50 GMT (envelope-from git) Date: Tue, 1 Nov 2022 18:54:50 GMT Message-Id: <202211011854.2A1IsoUq084646@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 0e482f8871e4 - main - Mk/Uses/fortran.mk: revert fa6fe3f8b6d7 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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e482f8871e46afd57589f87197a8a533e1aa3fc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667328890; 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=KNIbrgmh00KyrZTzEHobFF8Uc1tIleLQbZrpIiBzSTo=; b=LZfSejhnbCphaw/cnahWdb1mZCiub/NRQ1UE0SrwIrvga/48QY5MiCQCEyyKdIYOKfK1Yp cUxyYgfzFqwgNI2ndYewd5E0GuH7ccjjU4G0oyMl8Fqd93hVbxSjxVGrjRqqfwMb3XGr9e mKXe6ZlBZb4nvc4CZW0yykMR/AbOAD+IfYTPPqbWYLfjotwToL+JzeEIJeNl1PA7xy85HZ USnH8MDGQPD/DrThLiFfCj9AHeFKdyNwXhUlYrJSs4RILeORaNUALtoNxYswQXA93n74qm TKyPgOTG5mSXJznLKwSH92ZqPvrpXK83noQ9RaiYjIlh+QLFw7RhY9Pq4mR84A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667328890; a=rsa-sha256; cv=none; b=cNXpus9HRHp5WNbIwqMEmPR1OuYRrAY6xEqSbTELMLDu6oTtuUObe4tjx+vSrRRAXPNga/ F3eFqxQkn8tmPrDtaS6YsMxT06SRUpxe3R88GTwaChuJCCwFT98QvMnX2utyFdnVYg04wj YcX6VmqLcpkgtrw6L9Flg0USMtEwrjJlmjyysOlnIzywISJERsS72nr7wUgaC/04/1/EyE 5VOnn8dtnYhtVxn/T8wNGs31aK1l8NXMF3VM9sJIJjO1SoVfLLwpzyNLpR7xAUvgKOQxbr gxLnRPqbbjsRbxbyz39kY+yVRjbVEm6rwyFpuUM/2p31W9M8/oRdP0RZgNUAUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=0e482f8871e46afd57589f87197a8a533e1aa3fc commit 0e482f8871e46afd57589f87197a8a533e1aa3fc Author: Thierry Thomas AuthorDate: 2022-11-01 18:50:00 +0000 Commit: Thierry Thomas CommitDate: 2022-11-01 18:54:47 +0000 Mk/Uses/fortran.mk: revert fa6fe3f8b6d7 For some reason, net/mpich does not accept FC with F90. It should be possible to fix it, but I’m afraid that other ports could be affected too, so it seems better to revert for the moment. PR: 267502 Reported by: jfc (at) mit.edu --- Mk/Uses/fortran.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Mk/Uses/fortran.mk b/Mk/Uses/fortran.mk index 4bd092113ff8..4bf4d38d0799 100644 --- a/Mk/Uses/fortran.mk +++ b/Mk/Uses/fortran.mk @@ -18,7 +18,6 @@ _GCC_VER= ${GCC_DEFAULT:S/.//} BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER} RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER} F77= gfortran${_GCC_VER} -F90= gfortran${_GCC_VER} FC= gfortran${_GCC_VER} FFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} FCFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} @@ -29,7 +28,7 @@ IGNORE= USES=fortran: invalid arguments: ${fortran_ARGS} . endif USE_BINUTILS= yes -CONFIGURE_ENV+= F77="${F77}" F90="${F90}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}" -MAKE_ENV+= F77="${F77}" F90="${F90}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}" +CONFIGURE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}" +MAKE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}" .endif