Date: Tue, 15 Jun 2021 06:46:43 GMT From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a800fd141c4b - main - lang/opencoarrays: Simplify handling of GCC versions Message-ID: <202106150646.15F6kh8H005496@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=a800fd141c4bd0f89bf6d27d7ffbac24862e8cf5 commit a800fd141c4bd0f89bf6d27d7ffbac24862e8cf5 Author: Gerald Pfeifer <gerald@FreeBSD.org> AuthorDate: 2021-06-15 06:46:31 +0000 Commit: Gerald Pfeifer <gerald@FreeBSD.org> 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 <bsd.port.options.mk> -.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106150646.15F6kh8H005496>