From 5b38c8ba11ff0097701f8a666ec83d3c3a0ac821 Mon Sep 17 00:00:00 2001
From: tsutsui <tsutsui@pkgsrc.org>
Date: Mon, 24 Dec 2018 14:45:50 +0000
Subject: vala: apply the same hack as PR pkg/53743 for gcc 6.5.0 for
 NetBSD/evbarm.

Reported by bouyer@:
 http://mail-index.netbsd.org/pkgsrc-changes/2018/12/24/msg185017.html
Bump PKGREVISION again.
---
 lang/vala/Makefile | 4 ++--
 lang/vala/hacks.mk | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index 1b845d507c3..12327d6cfe9 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2018/12/24 00:10:09 tsutsui Exp $
+# $NetBSD: Makefile,v 1.49 2018/12/24 14:45:50 tsutsui Exp $
 
 DISTNAME=	vala-0.42.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vala/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/lang/vala/hacks.mk b/lang/vala/hacks.mk
index 92e3692e03f..7aa54246486 100644
--- a/lang/vala/hacks.mk
+++ b/lang/vala/hacks.mk
@@ -1,15 +1,16 @@
-# $NetBSD: hacks.mk,v 1.1 2018/12/24 00:10:09 tsutsui Exp $
+# $NetBSD: hacks.mk,v 1.2 2018/12/24 14:45:50 tsutsui Exp $
 
 .if !defined(VALA_HACKS_MK)
 VALA_HACKS_MK=	defined
 
 .include "../../mk/compiler.mk"
 
-### On NetBSD/earmv6hf 8.0 with gcc 5.5.0, vala binaries compiled with the
-### default optiomization options produce segmentation faulting.
+### On NetBSD/earmv6hf 8.0 with gcc 5.5.0 and 8.99.25 with gcc 6.5.0,
+### vala binaries compiled with the default optiomization options produce
+### segmentation faulting.
 ### Compiling with `-fno-optimize-sibling-calls' works around.
 ###
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) && !empty(CC_VERSION:Mgcc-5.*)
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) && !empty(CC_VERSION:Mgcc-[56].*)
 PKG_HACKS+=	optimisation
 CFLAGS+=	-fno-optimize-sibling-calls
 .endif
-- 
cgit v1.2.3