From 35f160c56413e2c6916d0ab670dbf9678a0a468a Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Mon, 19 Dec 2011 13:21:39 +0000
Subject: Fix compiler version grep to match better. Fixes build on NetBSD with
 gcc-4.5.

---
 benchmarks/nbench/distinfo                 |  3 ++-
 benchmarks/nbench/patches/patch-sysinfo.sh | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 benchmarks/nbench/patches/patch-sysinfo.sh

(limited to 'benchmarks')

diff --git a/benchmarks/nbench/distinfo b/benchmarks/nbench/distinfo
index fd338e26210..821a3ae9af7 100644
--- a/benchmarks/nbench/distinfo
+++ b/benchmarks/nbench/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2007/08/08 20:22:10 joerg Exp $
+$NetBSD: distinfo,v 1.3 2011/12/19 13:21:39 wiz Exp $
 
 SHA1 (nbench-byte-2.2.2.tar.gz) = 2ad7c76fb88f80e475650dd3802c187195cc80c1
 RMD160 (nbench-byte-2.2.2.tar.gz) = 78b8e1eaf3c24ca8c619a90693265402a4f8be68
 Size (nbench-byte-2.2.2.tar.gz) = 111751 bytes
 SHA1 (patch-aa) = 5beabbb962fc2a56b5561b6d5a3eaa882af3dbd1
 SHA1 (patch-ab) = 6308ca09483da37a72e17503ba8d6f342692e508
+SHA1 (patch-sysinfo.sh) = 56ec31e921b199c1926180acde87b30336bb4d1d
diff --git a/benchmarks/nbench/patches/patch-sysinfo.sh b/benchmarks/nbench/patches/patch-sysinfo.sh
new file mode 100644
index 00000000000..f7c312d359a
--- /dev/null
+++ b/benchmarks/nbench/patches/patch-sysinfo.sh
@@ -0,0 +1,15 @@
+$NetBSD: patch-sysinfo.sh,v 1.1 2011/12/19 13:21:39 wiz Exp $
+
+Avoid matching too many lines (trouble with gcc-4.5.3 on NetBSD)
+
+--- sysinfo.sh.orig	2004-12-30 02:58:29.000000000 +0000
++++ sysinfo.sh
+@@ -18,7 +18,7 @@ fi
+ 
+ compiler=`echo $* | sed -e 's/-static//g' -e 's/-Bstatic//g'`
+ if $TEST `basename $1` = "gcc" && ($compiler -v) >/dev/null 2>&1 ; then
+-    gccversion=`$compiler -v 2>&1 | sed -e "/version/!d"`
++    gccversion=`$compiler -v 2>&1 | sed -e "/ version/!d"`
+ else
+     gccversion="$1"
+ fi
-- 
cgit v1.2.3