svn commit: r559592 - in head/devel/got: . files

[Christian Weisgerber]

Author: naddy
Date: Tue Dec 29 16:26:45 2020
New Revision: 559592
URL: https://svnweb.freebsd.org/changeset/ports/559592

Log:
  Work around a bug in gcc <5.0 by compiling with -std=gnu89 instead of gnu99.
  https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63567
  
  Got will support building with gcc 4.2.1 until OpenBSD retires gcc
  on all archs.

Modified:
  head/devel/got/Makefile
  head/devel/got/files/patch-Makefile.inc

Modified: head/devel/got/Makefile
==============================================================================
--- head/devel/got/Makefile	Tue Dec 29 16:02:31 2020	(r559591)
+++ head/devel/got/Makefile	Tue Dec 29 16:26:45 2020	(r559592)
@@ -2,6 +2,7 @@
 
 PORTNAME=	got
 PORTVERSION=	0.47
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://gameoftrees.org/releases/
 
@@ -11,7 +12,7 @@ COMMENT=	Game of Trees version control system
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-USES=		compiler:c11 uidfix
+USES=		uidfix
 
 n=		${.newline}
 post-extract:

Modified: head/devel/got/files/patch-Makefile.inc
==============================================================================
--- head/devel/got/files/patch-Makefile.inc	Tue Dec 29 16:02:31 2020	(r559591)
+++ head/devel/got/files/patch-Makefile.inc	Tue Dec 29 16:26:45 2020	(r559592)
@@ -1,9 +1,15 @@
---- Makefile.inc.orig	2020-11-26 12:53:05 UTC
+--- Makefile.inc.orig	2020-12-19 00:55:45 UTC
 +++ Makefile.inc
-@@ -4,6 +4,13 @@ CPPFLAGS += -DGOT_LIBEXECDIR=${LIBEXECDIR} -DGOT_VERSI
+@@ -4,6 +4,19 @@ CPPFLAGS += -DGOT_LIBEXECDIR=${LIBEXECDIR} -DGOT_VERSI
  #CFLAGS += -DGOT_OBJ_CACHE_DEBUG
  #CFLAGS += -DGOT_DIFF_NO_MMAP
  
++# work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63567
++.include <bsd.compiler.mk>
++.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} < 50000
++CSTD = gnu89
++.endif
++
 +OPENBSD_COMPAT := ${.PARSEDIR}/openbsd-compat
 +CFLAGS += ${CPPFLAGS} -I${OPENBSD_COMPAT}
 +CFLAGS += -Wno-pointer-sign