git: 526802d9024c - main - devel/rgbds: Fix build on 12.4

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

From: Nuno Teixeira <eduardo_at_FreeBSD.org>
Date: Mon, 13 Mar 2023 08:08:21 UTC

The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=526802d9024cb7efee0c95372a4f283a8a578b2a

commit 526802d9024cb7efee0c95372a4f283a8a578b2a
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2023-03-13 08:01:20 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2023-03-13 08:08:10 +0000

    devel/rgbds: Fix build on 12.4
    
    Fix build on 12.4 using gcc because port only builds with clang <=10.
    
    MFH:            2023Q1 (build fixes)
---
 devel/rgbds/Makefile | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/devel/rgbds/Makefile b/devel/rgbds/Makefile
index 043e1985bd4b..3685a85a54d7 100644
--- a/devel/rgbds/Makefile
+++ b/devel/rgbds/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	rgbds
 DISTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	devel games
 MASTER_SITES=	https://github.com/gbdev/rgbds/releases/download/v${DISTVERSION}/
 
@@ -13,6 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		bison compiler:c11 dos2unix pkgconfig
+USE_GCC=	yes # clang >10 fails to build, https://github.com/gbdev/rgbds/issues/1091
 MAKE_ARGS=	Q= # verbose builds
 WRKSRC=		${WRKDIR}/rgbds
 
@@ -22,12 +24,4 @@ do-configure:
 		${CC} -std=gnu11 -D_POSIX_C_SOURCE=200809L -D_ISOC11_SOURCE -xc - 2>/dev/null || \
 		${REINPLACE_CMD} 's,-D_POSIX_C_SOURCE=200809L,,' ${WRKSRC}/Makefile
 
-.include <bsd.port.pre.mk>
-
-# clang build fails on 13.1 and 14 current
-# see https://github.com/gbdev/rgbds/issues/1091
-.if ${OSVERSION} >= 1300000
-USE_GCC=	yes
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>