diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile index 0d44409543f..8994ebca0c2 100644 --- a/benchmarks/iozone/Makefile +++ b/benchmarks/iozone/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2001/02/10 00:08:36 brad Exp $ +# $OpenBSD: Makefile,v 1.27 2001/02/26 02:19:30 brad Exp $ DISTNAME= iozone3_51 PKGNAME= iozone-3.51 @@ -16,6 +16,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +MAKE_ENV= CC="${CC}" + FLAVORS= threads FLAVOR?= diff --git a/benchmarks/iozone/patches/patch-makefile b/benchmarks/iozone/patches/patch-makefile new file mode 100644 index 00000000000..1e441e1b25b --- /dev/null +++ b/benchmarks/iozone/patches/patch-makefile @@ -0,0 +1,43 @@ +--- makefile.orig Sun Feb 25 20:56:28 2001 ++++ makefile Sun Feb 25 20:59:25 2001 +@@ -248,7 +248,7 @@ + # + + openbsd: iozone_openbsd.o libbif.o +- cc -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS -DSHARED_MEM \ ++ $(CC) $(CFLAGS) -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS -DSHARED_MEM \ + iozone_openbsd.o libbif.o -o iozone + + # +@@ -256,7 +256,7 @@ + # + + openbsd-threads: iozone_openbsd-threads.o libbif.o +- cc -O -pthread -Dunix -Dbsd4_4 -DHAVE_ANSIC_C \ ++ $(CC) $(CFLAGS) -pthread -Dunix -Dbsd4_4 -DHAVE_ANSIC_C \ + iozone_openbsd-threads.o libbif.o -o iozone + + # +@@ -570,18 +570,18 @@ + @echo "" + @echo "Build iozone for OpenBSD" + @echo "" +- cc -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \ ++ $(CC) -c $(CFLAGS) -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \ + -DSHARED_MEM iozone.c -o iozone_openbsd.o +- cc -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \ ++ $(CC) -c $(CFLAGS) -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \ + -DSHARED_MEM libbif.c -o libbif.o + + iozone_openbsd-threads.o: iozone.c libbif.c + @echo "" + @echo "Build iozone for OpenBSD with threads" + @echo "" +- cc -c -O -pthread -Dunix -Dbsd4_4 -DHAVE_ANSIC_C \ ++ $(CC) -c $(CFLAGS) -pthread -Dunix -Dbsd4_4 -DHAVE_ANSIC_C \ + iozone.c -o iozone_openbsd-threads.o +- cc -c -O -pthread -Dunix -Dbsd4_4 -DHAVE_ANSIC_C \ ++ $(CC) -c $(CFLAGS) -pthread -Dunix -Dbsd4_4 -DHAVE_ANSIC_C \ + libbif.c -o libbif.o + + iozone_OSFV3.o: iozone.c libbif.c