From nobody Fri Nov 04 16:43:04 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 4N3mdj05T8z4hC5X; Fri, 4 Nov 2022 16:43:05 +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 4N3mdh6nMJz3LWv; Fri, 4 Nov 2022 16:43:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667580184; 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=7MX+YZ7xIw3N28iwYYvgL+ddWPBquYa84wJjI5cYrvI=; b=w+i2c/2TU1IkPYCY/UzUZxJF3Pfufw85enfOmT+IK+0z7Y1NxuLEtlmlu48WCcqdSjQx/T TRmG9GaTJXyg12Do3QBuF9mrWSF8wEXSgRrgPofnlILWZjtlIII0sEHi/E+WfJ+ezVKors RFHz+nPcsgPSeFUiYPZa12nY96OD0SgsTLqPEFBBlAYIYPRq/JObF8OJWQV/hz7GNelXVZ 6kkXxit2VB0haGSKfCGRk42WBwD6jI4b2/+TK1qHdT6n0oJ0ZB3ofZcfVcqf/x1nljbHAw rdHj3YWFR64TyJatM37I9ThsYg5t6QxK3RJFIQjKiFQ653YorSB7/DrsMlPpSQ== 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 4N3mdh5ljQz1NbR; Fri, 4 Nov 2022 16:43:04 +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 2A4Gh43C007704; Fri, 4 Nov 2022 16:43:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A4Gh4Nj007703; Fri, 4 Nov 2022 16:43:04 GMT (envelope-from git) Date: Fri, 4 Nov 2022 16:43:04 GMT Message-Id: <202211041643.2A4Gh4Nj007703@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: 5d3d887e4814 - main - Mk/Uses/fortran.mk: set variables for F90 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: 5d3d887e48141fd7fe390f5763e64c895f5ac456 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667580185; 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=7MX+YZ7xIw3N28iwYYvgL+ddWPBquYa84wJjI5cYrvI=; b=eanaicTkBGBNUx26yVZPdVvALop0ozYIYh7sF4KGQqajU0vFeY/l58Y0KyBONIZJYMMIJg evxA9bZNsgq8ccoW51++hWNT+9roKYL6MolMCsnniN75nJvIZfYnl+fsVCgwpwsB9ZHvJt OPkPQjIve/jxqBjwxedrziu7Ch0OxuWkDDpsra7QydlhrwUgmiBAJB4SCFvxjbhoS5u9lU GxQHG7aI5HBfBd8fB1F7x2rhLjLzeNx32ADWmR5taRaMvcKRoNBIr/5/524QMaZMUZ2/SV 0az0yw7QgQ5f3wigSjWQKTR4JMd6Pl4COJVTi7LYkvczo25bLPemW/ckHlc6lQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667580185; a=rsa-sha256; cv=none; b=jiPTkwsiQ3NKEsQkxPyoU/0s/HR0uVYzULt2t3M0MkhoMTm+t8yJUhhiJW7dvLAeot506c KtW9fZ9n+QB9looKanJ6C1U+OfARt6hzOeGYr0W0+KGoQOHxRSnMQ2GbiXVFEvsY+vo33j dVfDG5ndnEyqHpngxOnG5kTIGHfly+2Hal5Oq4GkkgR9gusE2KMNidaTiVdqmQ6S9dIUnb EcMG1xuf9WrFbH3u4T5nmxnvo3sMzUEZgANeyidkcCYyjYgGw5+AG9fOB8bLxOhylfjt8c 2bPuody1YyWbl73v71bTc8n3mgjrzLxDi/NbOMmRe8C/H2qaPTfzNhiIOx5lrQ== 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=5d3d887e48141fd7fe390f5763e64c895f5ac456 commit 5d3d887e48141fd7fe390f5763e64c895f5ac456 Author: Thierry Thomas AuthorDate: 2022-11-04 14:02:13 +0000 Commit: Thierry Thomas CommitDate: 2022-11-04 16:42:38 +0000 Mk/Uses/fortran.mk: set variables for F90 Re-apply fa6fe3f8b6d7 now that net/mpich has been fixed. --- Mk/Uses/fortran.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/fortran.mk b/Mk/Uses/fortran.mk index 4bf4d38d0799..09ebd62b1a0f 100644 --- a/Mk/Uses/fortran.mk +++ b/Mk/Uses/fortran.mk @@ -18,8 +18,10 @@ _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} +F90FLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} FCFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} LDFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \ -L${LOCALBASE}/lib/gcc${_GCC_VER} -B${LOCALBASE}/bin @@ -28,7 +30,9 @@ IGNORE= USES=fortran: invalid arguments: ${fortran_ARGS} . endif USE_BINUTILS= yes -CONFIGURE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}" -MAKE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}" +CONFIGURE_ENV+= F77="${F77}" F90="${FC}" FC="${FC}" \ + FFLAGS="${FFLAGS}" F90FLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}" +MAKE_ENV+= F77="${F77}" F90="${FC}" FC="${FC}" \ + FFLAGS="${FFLAGS}" F90FLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}" .endif