pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/benchmarks/iozone Add DragonFly support. Use errno.h o...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/22b1f6237e25
branches:  trunk
changeset: 504544:22b1f6237e25
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Dec 13 14:25:01 2005 +0000

description:
Add DragonFly support. Use errno.h on all platforms. Don't play
stupid off64_t games on DragonFly, just use off_t.

diffstat:

 benchmarks/iozone/distinfo         |   3 +-
 benchmarks/iozone/patches/patch-ab |  87 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 1 deletions(-)

diffs (103 lines):

diff -r 911af9307e68 -r 22b1f6237e25 benchmarks/iozone/distinfo
--- a/benchmarks/iozone/distinfo        Tue Dec 13 12:19:37 2005 +0000
+++ b/benchmarks/iozone/distinfo        Tue Dec 13 14:25:01 2005 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.13 2005/10/19 15:27:19 adam Exp $
+$NetBSD: distinfo,v 1.14 2005/12/13 14:25:01 joerg Exp $
 
 SHA1 (iozone3_248.tar) = 86887e1af83f35aaf10e7e91d702f425ec9ee0f7
 RMD160 (iozone3_248.tar) = 90458276913289d0e5bae42df086f7baf1f0cd67
 Size (iozone3_248.tar) = 1474560 bytes
 SHA1 (patch-aa) = 1cdc9b4d965c7ee07fe0e5c64d7a2150a5beb8af
+SHA1 (patch-ab) = 15d49b2a927ce914c4e429fc71d3356237ce61c4
diff -r 911af9307e68 -r 22b1f6237e25 benchmarks/iozone/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/benchmarks/iozone/patches/patch-ab        Tue Dec 13 14:25:01 2005 +0000
@@ -0,0 +1,87 @@
+$NetBSD: patch-ab,v 1.5 2005/12/13 14:25:01 joerg Exp $
+
+--- iozone.c.orig      2005-12-13 14:04:05.000000000 +0000
++++ iozone.c
+@@ -61,12 +61,7 @@
+ #include <Windows.h>
+ int errno;
+ #else
+-#if defined(linux)
+ #include <errno.h>
+-#else
+-extern  int errno;   /* imported for errors */
+-extern  int h_errno; /* imported for errors */
+-#endif
+ #endif
+ 
+ 
+@@ -251,15 +246,15 @@ THISVERSION,
+ #include <unistd.h>
+ 
+ #include <fcntl.h>
+-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__)
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__DragonFly__)
+ #include <malloc.h>
+ #endif
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__)
+ #include <stdlib.h>
+ #include <string.h>
+ #endif
+ 
+-#if defined (__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)
++#if defined (__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__)
+ #ifndef O_SYNC
+ #define O_SYNC O_FSYNC
+ #endif
+@@ -296,25 +291,18 @@ THISVERSION,
+ #define MAP_FAILED -1
+ #endif
+ 
+-#ifdef generic
++#if defined(__DragonFly__)
++#define __off64_t_defined
++typedef off_t off64_t;
++#elif defined(generic)
+ typedef long long off64_t;
+ #endif
+ 
+-#ifndef solaris
+-#ifndef off64_t
+-#ifndef _OFF64_T
+-#ifndef __AIX__
+-#ifndef __off64_t_defined
+-#ifndef SCO_Unixware_gcc
+-#ifndef UWIN
++#if !defined(solaris) && !defined(off64_t) && !defined(_OFF64_T) && \
++    !defined(__AIX__) && !defined(__off64_t_defined) && \
++    !defined(SCO_Unixware_gcc) && !defined(UWIN)
+ typedef long long off64_t;
+ #endif
+-#endif
+-#endif
+-#endif
+-#endif
+-#endif
+-#endif
+ 
+ #ifdef __AIX__
+ #include <fcntl.h>
+@@ -325,7 +313,7 @@ typedef long long off64_t;
+ #endif
+ 
+ #ifdef unix
+-#if defined (__APPLE__) || defined(__FreeBSD__)
++#if defined (__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <sys/time.h>
+ #endif
+ #include <sys/times.h>
+@@ -357,7 +345,7 @@ typedef long long off64_t;
+ #define MS_ASYNC 0
+ #endif
+ 
+-#ifdef bsd4_4
++#if defined(bsd4_4) || defined(__DragonFly__)
+ #define MAP_ANONYMOUS MAP_ANON
+ #endif
+ 



Home | Main Index | Thread Index | Old Index