From owner-svn-ports-head@freebsd.org  Sun Dec 31 09:17:54 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9D307EAC39F;
 Sun, 31 Dec 2017 09:17:54 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 674126A439;
 Sun, 31 Dec 2017 09:17:54 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBV9Hr6D042207;
 Sun, 31 Dec 2017 09:17:53 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBV9Hrn0042206;
 Sun, 31 Dec 2017 09:17:53 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201712310917.vBV9Hrn0042206@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Sun, 31 Dec 2017 09:17:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r457674 - head/lang/guile2/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: danfe
X-SVN-Commit-Paths: head/lang/guile2/files
X-SVN-Commit-Revision: 457674
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 Dec 2017 09:17:54 -0000

Author: danfe
Date: Sun Dec 31 09:17:53 2017
New Revision: 457674
URL: https://svnweb.freebsd.org/changeset/ports/457674

Log:
  Improve GCC version check so it won't reject versions like 5.4, 6.4,
  7.2 and wrap `__clang__' with defined() to pacify -Wundef warning.

Modified:
  head/lang/guile2/files/patch-libguile_numbers.c

Modified: head/lang/guile2/files/patch-libguile_numbers.c
==============================================================================
--- head/lang/guile2/files/patch-libguile_numbers.c	Sun Dec 31 09:00:42 2017	(r457673)
+++ head/lang/guile2/files/patch-libguile_numbers.c	Sun Dec 31 09:17:53 2017	(r457674)
@@ -6,7 +6,7 @@
  
 +/* With old GCC, do not override _Static_assert: it conflicts with
 +   #include <complex.h> below. */
-+#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6)
++#if defined(__clang__) || (__GNUC__ * 10 + __GNUC_MINOR__ >= 46)
  #include <verify.h>
 +#endif
  #include <assert.h>