pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/benchmarks/hbench Work around RMS's ego when examining...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fbd50efdc520
branches:  trunk
changeset: 604091:fbd50efdc520
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Wed May 23 04:34:05 2012 +0000

description:
Work around RMS's ego when examining config.guess output. Should fix
Linux build.

diffstat:

 benchmarks/hbench/distinfo         |   4 ++--
 benchmarks/hbench/patches/patch-aq |  18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r d4de05c9fc46 -r fbd50efdc520 benchmarks/hbench/distinfo
--- a/benchmarks/hbench/distinfo        Wed May 23 04:28:29 2012 +0000
+++ b/benchmarks/hbench/distinfo        Wed May 23 04:34:05 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2012/02/28 15:49:56 hans Exp $
+$NetBSD: distinfo,v 1.19 2012/05/23 04:34:05 dholland Exp $
 
 SHA1 (hbench-OS-1.1.tar.gz) = b6c98f5fc9cd306df6bdd2cf7d8254100118b01a
 RMD160 (hbench-OS-1.1.tar.gz) = 023131dc9ae6239b9d64671e4128d691b78b310a
@@ -21,6 +21,6 @@
 SHA1 (patch-an) = 9ac065d203081a5779b87cca69ecadfbeff5c970
 SHA1 (patch-ao) = 69c92f83d10f061f8f0aa05da860cfc5cf764859
 SHA1 (patch-ap) = 057465b9f89e76367781401d91b333679a651cb4
-SHA1 (patch-aq) = 18f1d6191ff8a87a86004d5adb7bfbe56d36432b
+SHA1 (patch-aq) = 3174c28feeb8df6b7077653ab6e5df8fc5d3deb4
 SHA1 (patch-as) = 5e6668a93610db020a4de0e46620b37f24e53309
 SHA1 (patch-src_arch_i386_cyclecounter.c) = b2c41f7e2bae6deb561a4a010a2a8bb5eba3d19b
diff -r d4de05c9fc46 -r fbd50efdc520 benchmarks/hbench/patches/patch-aq
--- a/benchmarks/hbench/patches/patch-aq        Wed May 23 04:28:29 2012 +0000
+++ b/benchmarks/hbench/patches/patch-aq        Wed May 23 04:34:05 2012 +0000
@@ -1,10 +1,24 @@
-$NetBSD: patch-aq,v 1.5 2012/02/28 15:49:56 hans Exp $
+$NetBSD: patch-aq,v 1.6 2012/05/23 04:34:06 dholland Exp $
 
 - fix parallel build
 - solaris runs not only on sparc
+- work around RMS's ego in config.guess output
 
---- src/Makefile.orig  2011-09-12 10:59:10.000000000 +0000
+--- src/Makefile.orig  2012-05-23 04:39:22.000000000 +0000
 +++ src/Makefile
+@@ -71,9 +71,9 @@ SHELL=/bin/sh
+ 
+ CC=gcc
+ PLATFORM=`$(SHELL) ../scripts/config.guess`
+-ARCH=`$(SHELL) ../scripts/config.guess | sed 's/-.*-.*$$//'`
+-OS=`$(SHELL) ../scripts/config.guess | sed 's/^.*-.*-//'`
+-OSROOT=`$(SHELL) ../scripts/config.guess | sed 's/^.*-.*-//' | sed 's/[0-9].*$$//'`
++ARCH=`$(SHELL) ../scripts/config.guess | sed 's/-gnu$$//;s/-.*-.*$$//'`
++OS=`$(SHELL) ../scripts/config.guess | sed 's/-gnu$$//;s/^.*-.*-//'`
++OSROOT=`$(SHELL) ../scripts/config.guess | sed 's/-gnu$$//;s/^.*-.*-//' | sed 's/[0-9].*$$//'`
+ 
+ all:
+       @$(MAKE) BINDIR=../bin/$(OS)-$(ARCH) $(OSROOT)
 @@ -121,7 +121,7 @@ bsdi:
        @$(MAKE) LDLIBS="-lrpc" binaries
  



Home | Main Index | Thread Index | Old Index