Revision: 17966
http://gar.svn.sourceforge.net/gar/?rev=17966&view=rev
Author: aironskin
Date: 2012-05-07 09:09:04 +0000 (Mon, 07 May 2012)
Log Message:
-----------
iozone/trunk: Use one patch for the makefile, integrated contrib scripts
Modified Paths:
--------------
csw/mgar/pkg/iozone/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff
Removed Paths:
-------------
csw/mgar/pkg/iozone/trunk/files/0001-Always-use-LDFLAGS-during-linkage.patch
csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff
Modified: csw/mgar/pkg/iozone/trunk/Makefile
===================================================================
--- csw/mgar/pkg/iozone/trunk/Makefile 2012-05-07 07:51:10 UTC (rev 17965)
+++ csw/mgar/pkg/iozone/trunk/Makefile 2012-05-07 09:09:04 UTC (rev 17966)
@@ -14,6 +14,8 @@
read, pread ,mmap, aio_read, aio_write
endef
+VENDOR_URL = http://www.iozone.org/
+LICENSE_TEXT = This is freeware
MASTER_SITES = http://www.iozone.org/src/current/
DISTNAME = $(NAME)$(DISTVERSION)
@@ -27,20 +29,19 @@
DOCS += Iozone_ps.gz
DOCS += Run_rules.doc
+# Solaris10cc: Always use LDFLAGS during linkage, Solaris8-64-VXFS: Use
correct arch option
PATCHFILES = patch_makefile.diff
+# Move from man1 to man8
PATCHFILES += patch_manfile.diff
+# Use vx_ioctl.h in BUILDSRC instead of /opt/VRTSvxfs/include/sys/fs/
PATCHFILES += patch_vxioctl.diff
-# Make sure to always use LDFLAGS on linking
-PATCHFILES += 0001-Always-use-LDFLAGS-during-linkage.patch
+# Dependency for contributed scripts
+RUNTIME_DEP_PKGS = CSWgnuplot
PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
-VENDOR_URL = http://www.iozone.org/
-
-LICENSE_TEXT = This is freeware
-
BUILD64 = 1
ISAEXEC = 1
@@ -57,8 +58,6 @@
BUILD_ARGS += $(BUILD_TARGET)
-BUILD_SCRIPTS = $(WORKSRC)/src/current/makefile
-
BUILD_OVERRIDE_VARS += CFLAGS
BUILD_OVERRIDE_VAR_CFLAGS = $(CFLAGS)
@@ -68,14 +67,16 @@
BUILD_OVERRIDE_VARS += LDFLAGS
BUILD_OVERRIDE_VAR_LDFLAGS = $(LDFLAGS)
-# There is no testsuite
+BUILD_SCRIPTS = $(WORKSRC)/src/current/makefile
+
+# There is no test suite
TEST_SCRIPTS =
INSTALL_SCRIPTS = custom
include gar/category.mk
-# Put the VxFS header file into the build directory
+# Copy the VxFS header file into the build directory
post-extract-modulated:
mkdir -p $(WORKSRC)/src/current
cp $(WORKDIR)/vx_ioctl.h $(WORKSRC)/src/current
@@ -83,10 +84,21 @@
install-custom:
@echo " ==> Installing $(NAME)"
+ # Original Iozone files
ginstall -D $(WORKSRC)/src/current/iozone $(DESTDIR)$(bindir)/iozone
ginstall -D $(DOCSRC)/iozone.1 $(DESTDIR)$(mandir)/man8/iozone.8
ginstall -D $(DOCSRC)/IOzone_msword_98.pdf
$(DESTDIR)$(docdir)/iozone/IOzone_msword_98.pdf
ginstall $(DOCSRC)/IOzone_msword_98.doc
$(DESTDIR)$(docdir)/iozone/IOzone_msword_98.doc
ginstall $(DOCSRC)/Iozone_ps.gz $(DESTDIR)$(docdir)/iozone/Iozone_ps.gz
ginstall $(DOCSRC)/Run_rules.doc
$(DESTDIR)$(docdir)/iozone/Run_rules.doc
+ # Contributed files
+ ginstall -D $(WORKSRC)/src/current/Generate_Graphs
$(DESTDIR)$(bindir)/iozone-contrib/Generate_Graphs
+ ginstall $(WORKSRC)/src/current/gengnuplot.sh
$(DESTDIR)$(bindir)/iozone-contrib/gengnuplot.sh
+ ginstall $(WORKSRC)/src/current/gnu3d.dem
$(DESTDIR)$(bindir)/iozone-contrib/gnu3d.dem
+ ginstall $(WORKSRC)/src/current/gnuplot.dem
$(DESTDIR)$(bindir)/iozone-contrib/gnuplot.dem
+ ginstall $(WORKSRC)/src/current/gnuplotps.dem
$(DESTDIR)$(bindir)/iozone-contrib/gnuplotps.dem
+ ginstall $(WORKSRC)/src/current/iozone_visualizer.pl
$(DESTDIR)$(bindir)/iozone-contrib/iozone_visualizer.pl
+ ginstall $(WORKSRC)/src/current/report.pl
$(DESTDIR)$(bindir)/iozone-contrib/report.pl
+ ginstall $(WORKSRC)/src/current/Gnuplot.txt
$(DESTDIR)$(docdir)/iozone/Gnuplot.txt
+ chmod 444 $(DESTDIR)$(docdir)/iozone/Gnuplot.txt
@$(MAKECOOKIE)
Deleted:
csw/mgar/pkg/iozone/trunk/files/0001-Always-use-LDFLAGS-during-linkage.patch
===================================================================
---
csw/mgar/pkg/iozone/trunk/files/0001-Always-use-LDFLAGS-during-linkage.patch
2012-05-07 07:51:10 UTC (rev 17965)
+++
csw/mgar/pkg/iozone/trunk/files/0001-Always-use-LDFLAGS-during-linkage.patch
2012-05-07 09:09:04 UTC (rev 17966)
@@ -1,27 +0,0 @@
-From f8ff56d203f10bda91368020a57030dd9915a429 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <da\x...@opencsw.org>
-Date: Fri, 13 Apr 2012 11:03:45 +0200
-Subject: [PATCH] Always use LDFLAGS during linkage
-
----
- src/current/makefile | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/current/makefile b/src/current/makefile
-index 70bb6b3..d3ef9f6 100644
---- a/src/current/makefile
-+++ b/src/current/makefile
-@@ -384,8 +384,8 @@ Solaris10cc: iozone_solaris10cc.o libasync10cc.o
libbif10cc.o fileop_Solaris10cc
- $(CC) -O $(LDFLAGS) iozone_solaris10cc.o libasync10cc.o libbif10cc.o \
- -lthread -lpthread -lposix4 -lnsl -laio \
- -lsocket -o iozone
-- $(CC) -O fileop_Solaris10cc.o -o fileop
-- $(CC) -O pit_server.o -lthread -lpthread -lposix4 -lnsl -laio \
-+ $(CC) -O $(LDFLAGS) fileop_Solaris10cc.o -o fileop
-+ $(CC) -O $(LDFLAGS) pit_server.o -lthread -lpthread -lposix4 -lnsl
-laio \
- -lsocket -o pit_server
-
- #
---
-1.7.9
-
Deleted: csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff
===================================================================
--- csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff 2012-05-07 07:51:10 UTC
(rev 17965)
+++ csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff 2012-05-07 09:09:04 UTC
(rev 17966)
@@ -1,51 +0,0 @@
-From 0cdc6ee9569d94b7c720f0b9210e3ce08e73f484 Mon Sep 17 00:00:00 2001
-From: Stefan Schnyder <airons...@opencsw.org>
-Date: Wed, 21 Mar 2012 12:30:26 +0100
-Subject: [PATCH] Replaced deprecated option (generic64) and removed include
-
----
- src/current/makefile | 16 ++++++----------
- 1 files changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/src/current/makefile b/src/current/makefile
-index eb1fbec..70bb6b3 100644
---- a/src/current/makefile
-+++ b/src/current/makefile
-@@ -443,10 +443,9 @@ Solaris8-64: iozone_solaris8-64.o libasync.o libbif.o
- # Solaris 64 bit build with threads, largefiles, async I/O, and Vxfs
- #
- Solaris8-64-VXFS: iozone_solaris8-64-VXFS.o libasync.o libbif.o
-- $(CC) $(LDFLAGS) -fast -xtarget=generic64 -v -I/opt/VRTSvxfs/include/
-- iozone_solaris8-64-VXFS.o libasync.o libbif.o \
-- -lthread -lpthread -lposix4 -lnsl -laio \
-- -lsocket -o iozone
-+ $(CC) $(LDFLAGS) -fast -m64 -v iozone_solaris8-64-VXFS.o \
-+ libasync.o libbif.o -lthread -lpthread -lposix4 -lnsl \
-+ -laio -lsocket -o iozone
-
- #
- # Windows build requires Cygwin development environment. You
-@@ -1196,17 +1195,14 @@ iozone_solaris8-64-VXFS.o: iozone.c libasync.c libbif.c
- @echo ""
- @echo "Building iozone for Solaris8-64-VXFS"
- @echo ""
-- $(CC) -fast -xtarget=generic64 -v -c -I/opt/VRTSvxfs/include/ -Dunix \
-- -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \
-+ $(CC) -fast -m64 -v -c -Dunix -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \
- -D__LP64__ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
- -DNAME='"Solaris8-64"' -Dsolaris -DHAVE_PREAD \
- $(CFLAGS) iozone.c -o iozone_solaris8-64-VXFS.o
-- $(CC) -fast -xtarget=generic64 -v -c -I/opt/VRTSvxfs/include/ -Dunix \
-- -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \
-+ $(CC) -fast -m64 -v -c -Dunix -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \
- -D__LP64__ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
- -Dsolaris -DHAVE_PREAD $(CFLAGS) libasync.c -o libasync.o
-- $(CC) -fast -xtarget=generic64 -v -c -I/opt/VRTSvxfs/include/ -Dunix \
-- -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \
-+ $(CC) -fast -m64 -v -c -Dunix -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \
- -D__LP64__ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
- -Dsolaris -DHAVE_PREAD $(CFLAGS) libbif.c -o libbif.o
-
---
-1.7.9
-
Added: csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff
===================================================================
--- csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff
(rev 0)
+++ csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff 2012-05-07 09:09:04 UTC
(rev 17966)
@@ -0,0 +1,57 @@
+From 8bb2474580ef917f88f5effee55d4f292ade3a13 Mon Sep 17 00:00:00 2001
+From: Stefan Schnyder <airons...@opencsw.org>
+Date: Mon, 7 May 2012 09:46:04 +0200
+Subject: [PATCH] Solaris10cc: Always use LDFLAGS during linkage,
+ Solaris8-64-VXFS: Use correct arch option
+
+---
+ src/current/makefile | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/current/makefile b/src/current/makefile
+index eb1fbec..4e79be2 100644
+--- a/src/current/makefile
++++ b/src/current/makefile
+@@ -384,8 +384,8 @@ Solaris10cc: iozone_solaris10cc.o libasync10cc.o
libbif10cc.o fileop_Solaris10cc
+ $(CC) -O $(LDFLAGS) iozone_solaris10cc.o libasync10cc.o libbif10cc.o \
+ -lthread -lpthread -lposix4 -lnsl -laio \
+ -lsocket -o iozone
+- $(CC) -O fileop_Solaris10cc.o -o fileop
+- $(CC) -O pit_server.o -lthread -lpthread -lposix4 -lnsl -laio \
++ $(CC) -O $(LDFLAGS) fileop_Solaris10cc.o -o fileop
++ $(CC) -O $(LDFLAGS) pit_server.o -lthread -lpthread -lposix4 -lnsl
-laio \
+ -lsocket -o pit_server
+
+ #
+@@ -443,7 +443,7 @@ Solaris8-64: iozone_solaris8-64.o libasync.o libbif.o
+ # Solaris 64 bit build with threads, largefiles, async I/O, and Vxfs
+ #
+ Solaris8-64-VXFS: iozone_solaris8-64-VXFS.o libasync.o libbif.o
+- $(CC) $(LDFLAGS) -fast -xtarget=generic64 -v -I/opt/VRTSvxfs/include/
++ $(CC) $(LDFLAGS) -fast -m64 -v -I/opt/VRTSvxfs/include/
+ iozone_solaris8-64-VXFS.o libasync.o libbif.o \
+ -lthread -lpthread -lposix4 -lnsl -laio \
+ -lsocket -o iozone
+@@ -1196,16 +1196,16 @@ iozone_solaris8-64-VXFS.o: iozone.c libasync.c libbif.c
+ @echo ""
+ @echo "Building iozone for Solaris8-64-VXFS"
+ @echo ""
+- $(CC) -fast -xtarget=generic64 -v -c -I/opt/VRTSvxfs/include/ -Dunix \
++ $(CC) -fast -m64 -v -c -I/opt/VRTSvxfs/include/ -Dunix \
+ -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \
+ -D__LP64__ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
+ -DNAME='"Solaris8-64"' -Dsolaris -DHAVE_PREAD \
+ $(CFLAGS) iozone.c -o iozone_solaris8-64-VXFS.o
+- $(CC) -fast -xtarget=generic64 -v -c -I/opt/VRTSvxfs/include/ -Dunix \
++ $(CC) -fast -m64 -v -c -I/opt/VRTSvxfs/include/ -Dunix \
+ -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \
+ -D__LP64__ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
+ -Dsolaris -DHAVE_PREAD $(CFLAGS) libasync.c -o libasync.o
+- $(CC) -fast -xtarget=generic64 -v -c -I/opt/VRTSvxfs/include/ -Dunix \
++ $(CC) -fast -m64 -v -c -I/opt/VRTSvxfs/include/ -Dunix \
+ -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \
+ -D__LP64__ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
+ -Dsolaris -DHAVE_PREAD $(CFLAGS) libbif.c -o libbif.o
+--
+1.7.10
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
