[74365] trunk/dports/benchmarks/iozone
jmr at macports.org
jmr at macports.org
Tue Dec 14 02:09:28 PST 2010
Revision: 74365
http://trac.macports.org/changeset/74365
Author: jmr at macports.org
Date: 2010-12-14 02:09:22 -0800 (Tue, 14 Dec 2010)
Log Message:
-----------
iozone: update to 3_362
Modified Paths:
--------------
trunk/dports/benchmarks/iozone/Portfile
Added Paths:
-----------
trunk/dports/benchmarks/iozone/files/
trunk/dports/benchmarks/iozone/files/errno.diff
trunk/dports/benchmarks/iozone/files/makefile.diff
trunk/dports/benchmarks/iozone/files/printf-types.diff
Modified: trunk/dports/benchmarks/iozone/Portfile
===================================================================
--- trunk/dports/benchmarks/iozone/Portfile 2010-12-14 10:05:00 UTC (rev 74364)
+++ trunk/dports/benchmarks/iozone/Portfile 2010-12-14 10:09:22 UTC (rev 74365)
@@ -4,7 +4,7 @@
PortSystem 1.0
name iozone
-version 3_353
+version 3_362
categories benchmarks
platforms darwin
license Restrictive/Distributable/GPLv2+
@@ -21,18 +21,22 @@
master_sites ${homepage}src/current/
distname ${name}${version}
-checksums md5 a80be74d1629bdb2455b08db453beba0 \
- sha1 a0fbea0fce4f218b21a9fbbb95ab40645b06d24b \
- rmd160 b64283c45a2b843b5c274a14cf72b59075882f40
+checksums md5 dd7616451d5dcfec9cc4448f13731b56 \
+ sha1 b40795d87983f647f457f1caec854b4c52b7d11d \
+ rmd160 242c9f1384e821540a4f0bc3383fc9d56c2e0bc2
extract.suffix .tar
extract.cmd cat
extract.pre_args
worksrcdir ${distname}/src/current
+patchfiles makefile.diff printf-types.diff errno.diff
+
use_configure no
build.target macosx
-build.args CC=${configure.cc}
+build.args CC=${configure.cc} \
+ CFLAGS="${configure.cflags} ${configure.cc_archflags}" \
+ LDFLAGS="${configure.ld_archflags}"
destroot {
xinstall -m 555 ${worksrcpath}/iozone ${worksrcpath}/fileop \
Added: trunk/dports/benchmarks/iozone/files/errno.diff
===================================================================
--- trunk/dports/benchmarks/iozone/files/errno.diff (rev 0)
+++ trunk/dports/benchmarks/iozone/files/errno.diff 2010-12-14 10:09:22 UTC (rev 74365)
@@ -0,0 +1,11 @@
+--- iozone.c.orig 2010-12-14 20:51:02.000000000 +1100
++++ iozone.c 2010-12-14 20:56:16.000000000 +1100
+@@ -70,7 +70,7 @@
+ #include <Windows.h>
+ int errno;
+ #else
+-#if defined(linux) || defined(solaris)
++#if defined(linux) || defined(solaris) || defined(macosx)
+ #include <errno.h>
+ #else
+ extern int errno; /* imported for errors */
Added: trunk/dports/benchmarks/iozone/files/makefile.diff
===================================================================
--- trunk/dports/benchmarks/iozone/files/makefile.diff (rev 0)
+++ trunk/dports/benchmarks/iozone/files/makefile.diff 2010-12-14 10:09:22 UTC (rev 74365)
@@ -0,0 +1,16 @@
+--- makefile.orig 2010-12-14 09:22:04.000000000 +1100
++++ makefile 2010-12-14 21:04:08.000000000 +1100
+@@ -479,10 +479,10 @@ dragonfly: iozone_dragonfly.o libbif.o f
+ # GNU C compiler MacosX build with no threads, no largefiles, no async I/O
+ #
+
+-macosx: iozone_macosx.o libbif.o fileop_macosx.o pit_server.o
++macosx: iozone_macosx.o fileop_macosx.o pit_server.o
+ $(CC) -O $(LDFLAGS) iozone_macosx.o libbif.o -o iozone
+- $(CC) -O fileop_macosx.o -o fileop
+- $(CC) -O pit_server.o -o pit_server
++ $(CC) -O $(LDFLAGS) fileop_macosx.o -o fileop
++ $(CC) -O $(LDFLAGS) pit_server.o -o pit_server
+ #
+ #
+ # GNU C compiler OpenBSD build with no threads, no largefiles, no async I/O
Added: trunk/dports/benchmarks/iozone/files/printf-types.diff
===================================================================
--- trunk/dports/benchmarks/iozone/files/printf-types.diff (rev 0)
+++ trunk/dports/benchmarks/iozone/files/printf-types.diff 2010-12-14 10:09:22 UTC (rev 74365)
@@ -0,0 +1,101 @@
+--- pit_server.c.orig 2010-12-14 09:22:04.000000000 +1100
++++ pit_server.c 2010-12-14 20:36:31.000000000 +1100
+@@ -310,8 +310,8 @@ static int openSckt( const char *service
+ " ai_family = %d (PF_INET = %d, PF_INET6 = %d)\n"
+ " ai_socktype = %d (SOCK_STREAM = %d, SOCK_DGRAM = %d)\n"
+ " ai_protocol = %d (IPPROTO_TCP = %d, IPPROTO_UDP = %d)\n"
+- " ai_addrlen = %d (sockaddr_in = %d, "
+- "sockaddr_in6 = %d)\n",
++ " ai_addrlen = %d (sockaddr_in = %lu, "
++ "sockaddr_in6 = %lu)\n",
+ ai->ai_flags,
+ ai->ai_family,
+ PF_INET,
+@@ -620,8 +620,8 @@ static void pit( int tSckt[ ],
+ fprintf( stderr,
+ "Sockaddr info for new TCP client:\n"
+ " sa_family = %d (AF_INET = %d, AF_INET6 = %d)\n"
+- " addr len = %d (sockaddr_in = %d, "
+- "sockaddr_in6 = %d)\n",
++ " addr len = %d (sockaddr_in = %lu, "
++ "sockaddr_in6 = %lu)\n",
+ sadr->sa_family,
+ AF_INET,
+ AF_INET6,
+@@ -728,7 +728,7 @@ static void pit( int tSckt[ ],
+ {
+ ssize_t rBytes = count;
+ fprintf( stderr,
+- "%s: UDP datagram received (%d bytes).\n",
++ "%s: UDP datagram received (%ld bytes).\n",
+ pgmName,
+ count );
+ while ( count > 0 )
+@@ -745,8 +745,8 @@ static void pit( int tSckt[ ],
+ fprintf( stderr,
+ "Remote client's sockaddr info:\n"
+ " sa_family = %d (AF_INET = %d, AF_INET6 = %d)\n"
+- " addr len = %d (sockaddr_in = %d, "
+- "sockaddr_in6 = %d)\n",
++ " addr len = %d (sockaddr_in = %lu, "
++ "sockaddr_in6 = %lu)\n",
+ sadr->sa_family,
+ AF_INET,
+ AF_INET6,
+--- iozone.c.orig 2010-12-14 09:22:04.000000000 +1100
++++ iozone.c 2010-12-14 20:49:28.000000000 +1100
+@@ -7626,18 +7626,18 @@ long long *data1,*data2;
+ {
+ #ifdef _64BIT_ARCH_
+ #ifdef NO_PRINT_LLD
+- printf("\nError freading block %ld %x\n", i,
++ printf("\nError freading block %lu %lx\n", i,
+ (unsigned long long)buffer);
+ #else
+- printf("\nError freading block %ld %x\n", i,
++ printf("\nError freading block %llu %llx\n", i,
+ (unsigned long long)buffer);
+ #endif
+ #else
+ #ifdef NO_PRINT_LLD
+- printf("\nError freading block %ld %lx\n", i,
++ printf("\nError freading block %lu %lx\n", i,
+ (long)buffer);
+ #else
+- printf("\nError freading block %lld %lx\n", i,
++ printf("\nError freading block %llu %lx\n", i,
+ (long)buffer);
+ #endif
+ #endif
+@@ -7922,7 +7922,7 @@ long long *data1,*data2;
+ if(read(fd, (void *)nbuff, (size_t) reclen) != reclen)
+ {
+ #ifdef _64BIT_ARCH_
+- printf("\nError reading block %d %x\n", 0,
++ printf("\nError reading block %d %llx\n", 0,
+ (unsigned long long)nbuff);
+ #else
+ printf("\nError reading block %d %lx\n", 0,
+@@ -11516,9 +11516,9 @@ int shared_flag;
+ {
+ printf("\nUnable to get shared memory segment(shmget)\n");
+ #ifdef NO_PRINT_LLD
+- printf("shmid = %d, size = %ld, size1 = %d, Error %d\n",shmid,size,(size_t)size1,errno);
++ printf("shmid = %d, size = %ld, size1 = %lu, Error %d\n",shmid,size,(size_t)size1,errno);
+ #else
+- printf("shmid = %d, size = %lld, size1 = %d, Error %d\n",shmid,size,(size_t)size1,errno);
++ printf("shmid = %d, size = %lld, size1 = %lu, Error %d\n",shmid,size,(size_t)size1,errno);
+ #endif
+ exit(119);
+ }
+@@ -19698,8 +19698,8 @@ int send_size;
+ bzero(&outbuf,sizeof(struct client_neutral_command));
+ if(mdebug)
+ {
+- printf("Master_neutral_command size = %d\n",sizeof(struct master_neutral_command));
+- printf("Client_neutral_command size = %d\n",sizeof(struct client_neutral_command));
++ printf("Master_neutral_command size = %lu\n",sizeof(struct master_neutral_command));
++ printf("Client_neutral_command size = %lu\n",sizeof(struct client_neutral_command));
+ }
+ /*
+ * Convert internal commands to string format for neutral format/portability
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101214/641a5b12/attachment-0001.html>
More information about the macports-changes
mailing list