summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordmcmahill <dmcmahill@pkgsrc.org>2000-05-09 14:24:38 +0000
committerdmcmahill <dmcmahill@pkgsrc.org>2000-05-09 14:24:38 +0000
commit2e00fedc284bdac1bf5b726dbfa08247dfb64c4d (patch)
tree0212072b2ff70c2d3127f87eaea220853f066970
parentf24e1227c98affb56a693c52175492cc4bbbc922 (diff)
downloadpkgsrc-2e00fedc284bdac1bf5b726dbfa08247dfb64c4d.tar.gz
fixes for mips machines. Use 'uname -p' instead of 'uname -m'.
This fixes PR 7573 reported by Simon Burge and redundant PR 9950 reported by me (oops).
-rw-r--r--benchmarks/hbench/files/patch-sum4
-rw-r--r--benchmarks/hbench/patches/patch-ak16
2 files changed, 14 insertions, 6 deletions
diff --git a/benchmarks/hbench/files/patch-sum b/benchmarks/hbench/files/patch-sum
index e1acd0d13a2..fa42251dbad 100644
--- a/benchmarks/hbench/files/patch-sum
+++ b/benchmarks/hbench/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.5 2000/02/01 17:40:25 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.6 2000/05/09 14:24:38 dmcmahill Exp $
MD5 (patch-aa) = 6eb1137306628e30e2740959334dc8fa
MD5 (patch-ab) = f05c034b1426a25bc4915280287966fa
@@ -10,4 +10,4 @@ MD5 (patch-ag) = 11c5b7f4998c91bd357db562e2c090c4
MD5 (patch-ah) = 38948e5c29d4898c42a56849e12602bf
MD5 (patch-ai) = ae782e00813727b54f45afbe23fa962f
MD5 (patch-aj) = e145ccb7de3b093db3ec0676891578d5
-MD5 (patch-ak) = 24b44da87e8486f09fb3851e1f1227d5
+MD5 (patch-ak) = f296907f6188458ca860bd95edf777cb
diff --git a/benchmarks/hbench/patches/patch-ak b/benchmarks/hbench/patches/patch-ak
index 82f051fc698..d67922545ec 100644
--- a/benchmarks/hbench/patches/patch-ak
+++ b/benchmarks/hbench/patches/patch-ak
@@ -1,14 +1,22 @@
-$NetBSD: patch-ak,v 1.1 2000/02/01 17:40:24 dmcmahill Exp $
+$NetBSD: patch-ak,v 1.2 2000/05/09 14:24:39 dmcmahill Exp $
the original version would take things like "1.4.2_ALPHA" and change it to "1.4.2."
This messes up paths when ${OS_VERSION} is used in PLIST's and install scripts.
+Also, we want output like 'mipsel-unknown-netbsd1.4.1' not 'pmax-unknown-netbsd1.4.1'
+
--- scripts/config.guess.orig Thu Jun 26 20:31:08 1997
-+++ scripts/config.guess Tue Feb 1 12:28:06 2000
-@@ -386,5 +386,5 @@
++++ scripts/config.guess Tue May 9 10:13:07 2000
+@@ -42,4 +42,5 @@
+ fi
+
++UNAME_PROCESSOR=`(uname -p) 2>/dev/null` || UNAME_PROCESSOR=unknown
+ UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+@@ -386,5 +387,5 @@
exit 0 ;;
*:NetBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+ echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-].*/\./'`
++ echo ${UNAME_PROCESSOR}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-].*/\./'`
exit 0 ;;
*:OpenBSD:*:*)