[csw-devel] SF.net SVN: gar:[17649] csw/mgar/pkg/iozone/trunk

[dmichelsen at users.sourceforge.net]

Revision: 17649
          http://gar.svn.sourceforge.net/gar/?rev=17649&view=rev
Author:   dmichelsen
Date:     2012-04-13 13:39:13 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
iozone/trunk: Rework of build process

Modified Paths:
--------------
    csw/mgar/pkg/iozone/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/iozone/trunk/files/0001-Always-use-LDFLAGS-during-linkage.patch

Modified: csw/mgar/pkg/iozone/trunk/Makefile
===================================================================
--- csw/mgar/pkg/iozone/trunk/Makefile	2012-04-13 13:02:50 UTC (rev 17648)
+++ csw/mgar/pkg/iozone/trunk/Makefile	2012-04-13 13:39:13 UTC (rev 17649)
@@ -14,15 +14,14 @@
   read, pread ,mmap, aio_read, aio_write
 endef
 
-VENDOR_URL   = http://www.iozone.org/
+
 MASTER_SITES = http://www.iozone.org/src/current/
-
 DISTNAME     = $(NAME)$(DISTVERSION)
-DOCSRC       = $(WORKDIR)$(DISTNAME)/docs
 
 DISTFILES    = $(DISTNAME).tar
 DISTFILES   += vx_ioctl.h
 
+DOCSRC       = $(WORKDIR)/$(DISTNAME)/docs
 DOCS         = IOzone_msword_98.pdf
 DOCS        += IOzone_msword_98.doc
 DOCS        += Iozone_ps.gz
@@ -32,19 +31,46 @@
 PATCHFILES  += patch_manfile.diff
 PATCHFILES  += patch_vxioctl.diff
 
+# Make sure to always use LDFLAGS on linking
+PATCHFILES += 0001-Always-use-LDFLAGS-during-linkage.patch
+
+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
+
 CONFIGURE_SCRIPTS =
-TEST_SCRIPTS =
 
-PACKAGING_PLATFORMS = solaris9-sparc solaris10-sparc solaris10-i386
+BUILD_ARGS_5.9_i386_32   = Solaris
+BUILD_ARGS_5.9_sparc_32  = Solaris
+BUILD_ARGS_5.9_sparc_64  = Solaris8-64-VXFS
+BUILD_ARGS_5.10_sparc_32 = Solaris10cc
+BUILD_ARGS_5.10_sparc_64 = Solaris10cc
+BUILD_ARGS_5.10_i386_32  = Solaris10cc
+BUILD_ARGS_5.10_i386_64  = Solaris10cc
+BUILD_TARGET = $(BUILD_ARGS_$(GAROSREL)_$(GARCH)_$(MEMORYMODEL))
 
-BUILD_ARGS_5.9_sparc_64  += Solaris8-64-VXFS
-BUILD_ARGS_5.10_sparc_32 += Solaris10
-BUILD_ARGS_5.10_sparc_64 += Solaris10cc
-BUILD_ARGS_5.10_i386_32  += Solaris10
-BUILD_ARGS_5.10_i386_64  += Solaris10cc
-BUILD_ARGS += $(BUILD_ARGS_$(GAROSREL)_$(GARCH)_$(MEMORY_MODEL))
+BUILD_ARGS += $(BUILD_TARGET)
+
 BUILD_SCRIPTS = $(WORKSRC)/src/current/makefile
 
+BUILD_OVERRIDE_VARS += CFLAGS
+BUILD_OVERRIDE_VAR_CFLAGS = $(CFLAGS)
+
+BUILD_OVERRIDE_VARS += S10CCFLAGS
+BUILD_OVERRIDE_VAR_S10CCFLAGS = 
+
+BUILD_OVERRIDE_VARS += LDFLAGS
+BUILD_OVERRIDE_VAR_LDFLAGS = $(LDFLAGS)
+
+# There is no testsuite
+TEST_SCRIPTS =
+
 INSTALL_SCRIPTS = custom
 
 include gar/category.mk
@@ -52,7 +78,7 @@
 # Put the VxFS header file into the build directory
 post-extract-modulated:
 	mkdir -p $(WORKSRC)/src/current
-	cp $(FILEDIR)/vx_ioctl.h $(WORKSRC)/src/current
+	cp $(WORKDIR)/vx_ioctl.h $(WORKSRC)/src/current
 	@$(MAKECOOKIE)
 
 install-custom:

Added: 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	                        (rev 0)
+++ csw/mgar/pkg/iozone/trunk/files/0001-Always-use-LDFLAGS-during-linkage.patch	2012-04-13 13:39:13 UTC (rev 17649)
@@ -0,0 +1,27 @@
+From f8ff56d203f10bda91368020a57030dd9915a429 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <da\xC2m at 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
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.