Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Jan 2024 19:09:54 GMT
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 22ba7292a1c9 - main - net/mpich: apply the fix for clang 17 on all OSVERSION
Message-ID:  <202401231909.40NJ9sR8015415@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=22ba7292a1c9956f39d2004c0513bede7e2cbcee

commit 22ba7292a1c9956f39d2004c0513bede7e2cbcee
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2024-01-23 18:59:12 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2024-01-23 19:09:49 +0000

    net/mpich: apply the fix for clang 17 on all OSVERSION
    
    clang-17 has been MFC’ed: do not check OSVERSION but rather COMPILER_VERSION.
    
    PR:             276035
    Reported by:    pmc (at) citylink.dinoex.sub.org
---
 net/mpich/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index 0a356031c872..5d47ba506aa9 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -76,9 +76,9 @@ CONFIGURE_ARGS=	--enable-fast=""	\
 		LIBS="-L${LOCALBASE}/lib -lepoll-shim -ljson-c -lm"	\
 		BASH_SHELL=${LOCALBASE}/bin/bash
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1500005
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} == 170
 # linker error when compiling with llvm 17.0.6 on CURRENT - PR 276035
 # To be removed with llvm-18
 CONFIGURE_ENV+=	ac_cv_sizeof___float128=0
@@ -115,4 +115,4 @@ post-extract:
 post-patch:
 	${RM} -r ${WRKSRC}/www
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401231909.40NJ9sR8015415>