[csw-devel] SF.net SVN: gar:[11709] csw/mgar/pkg/fio/trunk

[skayser at users.sourceforge.net]

Revision: 11709
          http://gar.svn.sourceforge.net/gar/?rev=11709&view=rev
Author:   skayser
Date:     2010-11-24 11:33:59 +0000 (Wed, 24 Nov 2010)

Log Message:
-----------
fio: prepare for solaris 9, reduce patches via INSTALL_OVERRIDE_VARS

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

Added Paths:
-----------
    csw/mgar/pkg/fio/trunk/files/0006-Use-CLOCK_HIGHRES-if-CLOCK_MONOTONIC-is-missing.patch

Modified: csw/mgar/pkg/fio/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fio/trunk/Makefile	2010-11-24 11:14:05 UTC (rev 11708)
+++ csw/mgar/pkg/fio/trunk/Makefile	2010-11-24 11:33:59 UTC (rev 11709)
@@ -1,5 +1,13 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
+#
+# ! Solaris 9 is missing getopt_long
+#   gcc -mtune=i686 -O2 -pipe -m32 -march=i386 -D__EXTENSIONS__ -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFIO_INC_DEBUG -o fio gettime.o fio.o ioengines.o init.o stat.o log.o time.o filesetup.o eta.o verify.o memory.o io_u.o parse.o mutex.o options.o rbtree.o fifo.o smalloc.o filehash.o lib/strsep.o helpers.o solaris.o profile.o debug.o lib/rand.o lib/flist_sort.o lib/num2str.o crc/crc7.o crc/crc16.o crc/crc32.o crc/crc32c.o crc/crc32c-intel.o crc/crc64.o crc/sha1.o crc/sha256.o crc/sha512.o crc/md5.o engines/cpu.o engines/mmap.o engines/posixaio.o engines/sync.o engines/null.o engines/net.o engines/solarisaio.o  -lpthread -lm -ldl -laio -lrt -lnsl -lsocket
+#   Undefined                       first referenced
+#   symbol                             in file
+#   getopt_long_only                    init.o
+#
 
+
 GARNAME = fio
 GARVERSION = 1.44.2
 CATEGORIES = apps
@@ -23,17 +31,12 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 PATCHFILES += 0001-Honour-GAR-CFLAGS-and-use-inttypes.h-instead-of-stdi.patch
-PATCHFILES += 0002-Honor-prefix-when-installing-fio.patch
 PATCHFILES += 0003-Install-man-pages.patch
-PATCHFILES += 0004-Honor-GAR-provided-default-bindir-and-mandir.patch
-
 # Should be integrated in future releases,
 # cf. http://www.spinics.net/lists/fio/msg00580.html
 PATCHFILES += 0005-Warn-on-missing-direct-IO-support.patch
+PATCHFILES += 0006-Use-CLOCK_HIGHRES-if-CLOCK_MONOTONIC-is-missing.patch
 
-# CLOCK_MONOTONIC undefined / not present on Solaris 9
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-
 # fio compiler/compiler.h #errors out non gcc compilers
 GARCOMPILER  = GCC3
 # Required for PTHREAD_STACK_MIN
@@ -44,11 +47,13 @@
 TEST_SCRIPTS =
 INSTALL_ARGS = -f Makefile.solaris
 
+INSTALL_OVERRIDE_VARS = INSTALL prefix mandir
+INSTALL_OVERRIDE_VAR_INSTALL = $(bindir)/ginstall
+INSTALL_OVERRIDE_VAR_prefix  = $(prefix)
+INSTALL_OVERRIDE_VAR_mandir  = $(mandir)
+
 include gar/category.mk
 
-# install target requires ginstall as install
-PATH := /opt/csw/gnu/:$(PATH)
-
 post-install-modulated:
 	mkdir -p $(PKGROOT)$(docdir)/fio/examples
 	cp $(WORKSRC)/examples/* $(PKGROOT)$(docdir)/fio/examples/

Added: csw/mgar/pkg/fio/trunk/files/0006-Use-CLOCK_HIGHRES-if-CLOCK_MONOTONIC-is-missing.patch
===================================================================
--- csw/mgar/pkg/fio/trunk/files/0006-Use-CLOCK_HIGHRES-if-CLOCK_MONOTONIC-is-missing.patch	                        (rev 0)
+++ csw/mgar/pkg/fio/trunk/files/0006-Use-CLOCK_HIGHRES-if-CLOCK_MONOTONIC-is-missing.patch	2010-11-24 11:33:59 UTC (rev 11709)
@@ -0,0 +1,30 @@
+From b397b31970a4bba209fdd7d7e82d9ab0868ba0e2 Mon Sep 17 00:00:00 2001
+From: Sebastian Kayser <skayser at opencsw.org>
+Date: Wed, 24 Nov 2010 11:21:12 +0100
+Subject: [PATCH] Use CLOCK_HIGHRES if CLOCK_MONOTONIC is missing
+
+Needed for Solaris 9 where CLOCK_MONOTONIC isn't available. Samba
+follows a similar approach, cf.
+http://git.samba.org/samba.git/?p=samba.git;a=blob;f=lib/replace/system/time.h;h=5fce4dbc45b4203fe8a79c732692d3fd90aeb51e;hb=HEAD
+---
+ engines/posixaio.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/engines/posixaio.c b/engines/posixaio.c
+index f27ad8c..0ca6818 100644
+--- a/engines/posixaio.c
++++ b/engines/posixaio.c
+@@ -12,6 +12,10 @@
+ 
+ #include "../fio.h"
+ 
++#ifndef CLOCK_MONOTONIC
++#define CLOCK_MONOTONIC CLOCK_HIGHRES
++#endif /* CLOCK_MONOTONIC isn't available on Solaris 9 */
++
+ #ifdef FIO_HAVE_POSIXAIO
+ 
+ struct posixaio_data {
+-- 
+1.7.3
+


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