From owner-dev-commits-ports-all@freebsd.org Tue Jun 15 06:46:43 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DDB5A640ECC; Tue, 15 Jun 2021 06:46:43 +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 4G3zPb5xh0z4dvT; Tue, 15 Jun 2021 06:46:43 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B56C12343F; Tue, 15 Jun 2021 06:46:43 +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 15F6khjB005497; Tue, 15 Jun 2021 06:46:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15F6kh8H005496; Tue, 15 Jun 2021 06:46:43 GMT (envelope-from git) Date: Tue, 15 Jun 2021 06:46:43 GMT Message-Id: <202106150646.15F6kh8H005496@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: a800fd141c4b - main - lang/opencoarrays: Simplify handling of GCC versions MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a800fd141c4bd0f89bf6d27d7ffbac24862e8cf5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2021 06:46:43 -0000 The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=a800fd141c4bd0f89bf6d27d7ffbac24862e8cf5 commit a800fd141c4bd0f89bf6d27d7ffbac24862e8cf5 Author: Gerald Pfeifer AuthorDate: 2021-06-15 06:46:31 +0000 Commit: Gerald Pfeifer CommitDate: 2021-06-15 06:46:31 +0000 lang/opencoarrays: Simplify handling of GCC versions GCC_DEFAULT now is at least 8, so we can simplify this port and remove special casing for GCC versions 6 and 7. Approved by: maintainer timeout (four months / 11 weeks) --- lang/opencoarrays/Makefile | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/lang/opencoarrays/Makefile b/lang/opencoarrays/Makefile index c1fc30a961fd..4a2d2e74e63b 100644 --- a/lang/opencoarrays/Makefile +++ b/lang/opencoarrays/Makefile @@ -24,7 +24,7 @@ GH_ACCOUNT= sourceryinstitute GH_PROJECT= OpenCoarrays USE_LDCONFIG= yes -PLIST_SUB= GCC_VER=${_GCC_VER} PORTVERSION=${PORTVERSION} +PLIST_SUB= GCC_VER=${_GCC_VER} PORTVERSION=${PORTVERSION} SOVERSION=3 OPTIONS_SINGLE= MPI OPTIONS_SINGLE_MPI= MPICH OPENMPI @@ -42,16 +42,6 @@ OPENMPI_CMAKE_ON= -DMPI_C_COMPILE_OPTIONS="-lpthread" \ .include -.if ${GCC_DEFAULT} >= 8 -PLIST_SUB+= SOVERSION=3 -.elif ${GCC_DEFAULT} == 7 -PLIST_SUB+= SOVERSION=2 -.elif ${GCC_DEFAULT} == 6 -PLIST_SUB+= SOVERSION=1 -.else -IGNORE= requires GCC 6 or higher -.endif - post-patch: @${REINPLACE_CMD} '/mod_dir_tail/s/$${CMAKE_Fortran_COMPILER_VERSION}/${_GCC_VER}/' \ ${WRKSRC}/CMakeLists.txt