From nobody Fri Nov 04 16:43:03 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 4N3mdg6dPsz4hBvl; Fri, 4 Nov 2022 16:43:03 +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 4N3mdg5mQMz3LXJ; Fri, 4 Nov 2022 16:43:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667580183; 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=dfAJ8eVOUpv83CvbD8/Ir5D9g8gbQzOVKeg9bJwJuLw=; b=ZqYlXHMyF8Ej2ZK6NX03slXIEHPE50nGIZ5VueRX/gVg3gW2/3QrET9VVDwpHO8z9UFj1z 1kgZy2f60azh+yWPlEsuG34Dg+EG9WSf+kEjWqPE0a53gptNYbwKbky7sG7IQVy8q3X5Qr +QPPt8YyazPQUbVGwhSeidoiMkBxdCpRq0T2tjLtcRloHendp3LswWMHEiA43locCliwih bFd8JGSor4Oe8zF68L9v6VKgOVhvJSP04DxDIeWh1J1Vt8a9oICKkVAP/ZeQepQlZ/kfQv IyF0/NyfgJeFoWvfF3vB2i+B6ihyuL/rHmdaNVZTZMvuH19q33ah3L9qfN3q5g== 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 4N3mdg4n6vz1NGj; Fri, 4 Nov 2022 16:43:03 +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 2A4Gh3A6007680; Fri, 4 Nov 2022 16:43:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A4Gh3mZ007679; Fri, 4 Nov 2022 16:43:03 GMT (envelope-from git) Date: Fri, 4 Nov 2022 16:43:03 GMT Message-Id: <202211041643.2A4Gh3mZ007679@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: 53dcf591d2e9 - main - net/mpich: do not fail when F90 is set 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: 53dcf591d2e901db8fb228f1ccd3e63efdc82215 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667580183; 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=dfAJ8eVOUpv83CvbD8/Ir5D9g8gbQzOVKeg9bJwJuLw=; b=lFSVrDD1A55MrW4Q51Dp0oZGq1CNKiHAlGDj5MLLtiOBZ5MHbR5T8bRud3lISMeBuVZm8t 4XLNkyLQdFs1G9DLNt+Vrn+cbIJwVlxgTbq1GZGrIfMe7YcZw+EDXZ2TV48MubBhS0cSrT 2KhSTwqLQdnK+ZdenlD5CMozkjErGtjD8col3qJ8kQVv7FIyDe5XDf3lINZCxJYnT3DmA4 g/BcwX84hMZJE0unhGn26X70ozzDu8NPQf77O5tjDW6fQceHmqy7rDVJ8NvHI9x0WBkaz+ w6sRFmcCnxfoXEijMaqMmeGeWGfTeUW/oLQ3BmCP6d8YYHgvjYcdH+ORQ/M4aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667580183; a=rsa-sha256; cv=none; b=bivZAmxxtzKx+GRuReztipvJGHeLBCDMXn802aKMWvkD3usbAMFIU+CvAQwntxzWniQVZK lPTGf7/TIFKK7Toa3HkoMLI2ailO8ktk2RHi6rgEMFmYXXHCZsL7uPjoqwqR9i1fzc/uk4 VrRXqJ/SjzPR7d0RkIguYK/gPEKql7x0E6gsoOKy7LYZnpnFElIhtVeo9ch2fNDUHlufRP VFp71rZKjtGRBFnC9jniorJwPuy1/f4T3cNrM+AN19J5d9gGW/54yi26Ly9xfeR0idZbqh 8Grb2DzZd6cxXbWbt14KCJWghpXNx9tCfhcAOkVm1nK/7wwnoA/m4pWYIsl37Q== 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=53dcf591d2e901db8fb228f1ccd3e63efdc82215 commit 53dcf591d2e901db8fb228f1ccd3e63efdc82215 Author: Olivier Certner AuthorDate: 2022-11-04 14:00:00 +0000 Commit: Thierry Thomas CommitDate: 2022-11-04 16:42:38 +0000 net/mpich: do not fail when F90 is set PR: 267502 --- net/mpich/files/patch-configure | 27 ++++++++++++++++++++++----- net/mpich/files/patch-test_mpi_configure | 26 ++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/net/mpich/files/patch-configure b/net/mpich/files/patch-configure index 6f24e6b3da55..28fb585ffa4e 100644 --- a/net/mpich/files/patch-configure +++ b/net/mpich/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2021-05-26 20:57:14 UTC +--- configure.orig 2021-12-16 17:26:22 UTC +++ configure -@@ -1217,8 +1217,6 @@ HWLOC_top_builddir +@@ -1217,8 +1217,6 @@ hwlocsrcdir hwloclib hwloclibdir hwlocsrcdir @@ -9,7 +9,7 @@ VISIBILITY_CFLAGS BUILD_PROFILING_LIB_FALSE BUILD_PROFILING_LIB_TRUE -@@ -31276,337 +31274,7 @@ if test "$NEEDSPLIB" = "yes" ; then +@@ -31276,337 +31274,7 @@ fi VISIBILITY_CFLAGS="" fi @@ -347,7 +347,24 @@ # ---------------------------------------------------------------------------- # HWLOC # ---------------------------------------------------------------------------- -@@ -46449,18 +46117,8 @@ the same routine with arguments of different types." " +@@ -43674,16 +43342,6 @@ _ACEOF + # must come first. + # ---------------------------------------------------------------------------- + +-# +-# First, determine whether we are/can support the language bindings +-# +-# Since F90/F90FLAGS are replaced by FC/FCFLAGS, rather than silently +-# substituting them, i.e. FC=$F90 and FCFLAGS=$F90FLAGS, we choose to emit +-# an error message and abort to avoid any ambiguous/hidden bug in choosing +-# Fortran90 compilers. +-if test -n "$F90" -o -n "$F90FLAGS" ; then +- as_fn_error $? "F90 and F90FLAGS are replaced by FC and FCFLAGS respectively in this configure, please unset F90/F90FLAGS and set FC/FCFLAGS instead and rerun configure again." "$LINENO" 5 +-fi + # ---------------------------------------------------------------------------- + # Handle default choices for the Fortran compilers + # Note that these have already been set above +@@ -46449,18 +46107,8 @@ addarg=$pac_cv_prog_f77_mismatched_args_parm fi addarg=$pac_cv_prog_f77_mismatched_args_parm @@ -367,7 +384,7 @@ bindings="$bindings f77" $as_echo "#define HAVE_FORTRAN_BINDING 1" >>confdefs.h -@@ -52094,6 +51752,9 @@ if ${ac_cv_alignof_wchar_t+:} false; then : +@@ -52094,6 +51742,9 @@ else $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_wchar_t" "$ac_includes_default diff --git a/net/mpich/files/patch-test_mpi_configure b/net/mpich/files/patch-test_mpi_configure index 7a10fdc30536..17357f8efb8a 100644 --- a/net/mpich/files/patch-test_mpi_configure +++ b/net/mpich/files/patch-test_mpi_configure @@ -1,6 +1,28 @@ ---- test/mpi/configure.orig 2021-01-05 15:32:00 UTC +--- test/mpi/configure.orig 2021-12-16 17:25:47 UTC +++ test/mpi/configure -@@ -10907,17 +10907,7 @@ the same routine with arguments of different types." " +@@ -4486,21 +4486,9 @@ fi + fi + fi + +-# First, determine whether we are/can support the language bindings +-# +-# Since F90/F90FLAGS are replaced by FC/FCFLAGS, rather than silently +-# substituting them, i.e. FC=$F90 and FCFLAGS=$F90FLAGS, we choose to emit +-# an error message and abort to avoid any ambiguous/hidden bug in choosing +-# Fortran90 compilers. +-if test -n "$F90" -o -n "$F90FLAGS" ; then +- as_fn_error $? "F90 and F90FLAGS are replaced by FC and FCFLAGS respectively in this configure, please unset F90/F90FLAGS and set FC/FCFLAGS instead and rerun configure again." "$LINENO" 5 +-fi + + # ------------------------------------------------------------------------ + +- +-# ------------------------------------------------------------------------ +- + if test "$enable_threads" = "yes" ; then + enable_threads=multiple + elif test "$enable_threads" = "no" ; then +@@ -11038,17 +11026,7 @@ addarg=$pac_cv_prog_f77_mismatched_args_parm fi addarg=$pac_cv_prog_f77_mismatched_args_parm