git: 609a898520a5 - main - devel/corrade: Fix build with llvm16

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Wed, 19 Jul 2023 15:28:08 UTC

The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=609a898520a5272b9cfbad19d9e6e7d1ac5ef997

commit 609a898520a5272b9cfbad19d9e6e7d1ac5ef997
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-07-19 15:22:05 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-07-19 15:27:55 +0000

    devel/corrade: Fix build with llvm16
    
    This patch fixes to build the consumers of this port specially
    graphics/magnum*.
    
    Approved by:    portmgr (blanket)
    Sponsored by:   The FreeBSD Foundation
---
 devel/corrade/Makefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/devel/corrade/Makefile b/devel/corrade/Makefile
index 815f347cd220..3e92c16357a1 100644
--- a/devel/corrade/Makefile
+++ b/devel/corrade/Makefile
@@ -2,6 +2,7 @@ PORTNAME=	corrade
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2020.06-1214
 DISTVERSIONSUFFIX=	-g3bf6057d
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -23,4 +24,13 @@ CMAKE_ARGS=	-DLIB_SUFFIX:STRING=""
 OPTIONS_DEFINE=	TEST
 TEST_CMAKE_BOOL=	CORRADE_BUILD_TESTS
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+post-patch:
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
+	@${REINPLACE_CMD} -e 's|#include <__tuple>|#include <tuple>|g' \
+		${WRKSRC}/src/Corrade/Utility/StlForwardArray.h \
+		${WRKSRC}/src/Corrade/Utility/StlForwardTuple.h
+.endif
+
+.include <bsd.port.post.mk>