[csw-devel] SF.net SVN: gar:[15049] csw/mgar/pkg/lsof/trunk

[dmichelsen at users.sourceforge.net]

Revision: 15049
          http://gar.svn.sourceforge.net/gar/?rev=15049&view=rev
Author:   dmichelsen
Date:     2011-07-13 10:13:08 +0000 (Wed, 13 Jul 2011)

Log Message:
-----------
lsof: Add VxFS support

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

Added Paths:
-----------
    csw/mgar/pkg/lsof/trunk/files/0002-Disable-VxFS-autodetect.patch

Modified: csw/mgar/pkg/lsof/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lsof/trunk/Makefile	2011-07-12 16:09:44 UTC (rev 15048)
+++ csw/mgar/pkg/lsof/trunk/Makefile	2011-07-13 10:13:08 UTC (rev 15049)
@@ -21,6 +21,9 @@
 # This seems to be necessary as the above comment says
 PATCHFILES += 0001-Use-lgrp.h.patch
 
+# Do not automatically use VxFS
+PATCHFILES += 0002-Disable-VxFS-autodetect.patch
+
 SRCDIST = $(DISTNAME)_src
 WORKSRC   = $(WORKDIR)/$(DISTNAME)/$(SRCDIST)
 
@@ -31,18 +34,14 @@
 LICENSE = lsof-license
 
 BUILD64 = 1
+
+EXTRA_BUILD_ISAS = sparcv8plus
+
 ISAEXEC = 1
 
 CONFIGURE_SCRIPTS = custom
 CONFIGURE_ARGS    = -n solariscc
 
-TEST_SCRIPTS = custom
-
-# Tests require root
-SKIPTEST ?= 1
-
-INSTALL_SCRIPTS = custom
-
 # Environment variables affecting Solaris builds:
 #   SOLARIS_23P101318     If this environment variable has a non-NULL value, the
 #   SOLARIS_24P101945     If this environment variable has a non-NULL value, the
@@ -54,13 +53,29 @@
 #   SOLARIS_KERNBITS      specifies the number of bits in the Solaris 7, 8, 9 or
 #   SOLARIS_VSOCK         If this environment variable has a value of "Y" or "y",
 #   SOLARIS_VXFSINCL      This environment variable defines the path to the
-#   SOLARIS_VXFSLIB               This environment variable defines the path to the
+#   SOLARIS_VXFSLIB       This environment variable defines the path to the
 
-CONFIGURE_EXPORTS = LSOF_CFGF SOLARIS_CCDIR SOLARIS_INSTR SOLARIS_KERNBITS
+CONFIGURE_EXPORTS = LSOF_CFGF SOLARIS_CCDIR SOLARIS_INSTR SOLARIS_KERNBITS SOLARIS_VXFSINCL SOLARIS_VXFSLIB
 SOLARIS_CCDIR = $(CC_HOME)/bin
 SOLARIS_INSTR = $(ISA)
 SOLARIS_KERNBITS = $(MEMORYMODEL)
 
+# The Veritas Filesystem library libvxfsutil.a is sparcv8+, make sure to build that
+# specific ISA and not link when building sparcv8
+SOLARIS_VXFSINCL-sparcv8plus = /opt/VRTS/include
+SOLARIS_VXFSINCL-sparcv9     = /opt/VRTS/include
+SOLARIS_VXFSLIB-sparcv8plus = /opt/VRTS/lib
+SOLARIS_VXFSLIB-sparcv9     = /opt/VRTS/lib
+SOLARIS_VXFSINCL = $(SOLARIS_VXFSINCL-$(ISA))
+SOLARIS_VXFSLIB = $(SOLARIS_VXFSLIB-$(ISA))
+
+TEST_SCRIPTS = custom
+
+# Tests require root
+SKIPTEST ?= 1
+
+INSTALL_SCRIPTS = custom
+
 BUILD_OVERRIDE_VARS = CDEF
 BUILD_OVERRIDE_VAR_CDEF = $(CFLAGS)
 

Added: csw/mgar/pkg/lsof/trunk/files/0002-Disable-VxFS-autodetect.patch
===================================================================
--- csw/mgar/pkg/lsof/trunk/files/0002-Disable-VxFS-autodetect.patch	                        (rev 0)
+++ csw/mgar/pkg/lsof/trunk/files/0002-Disable-VxFS-autodetect.patch	2011-07-13 10:13:08 UTC (rev 15049)
@@ -0,0 +1,31 @@
+From 3becdff778a4fab025b344b733e4767395e54216 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 13 Jul 2011 12:05:30 +0200
+Subject: [PATCH] Disable VxFS autodetect
+
+---
+ lsof_4.84_src/Configure |    8 --------
+ 1 files changed, 0 insertions(+), 8 deletions(-)
+
+diff --git a/lsof_4.84_src/Configure b/lsof_4.84_src/Configure
+index 6ebc7be..c413f5d 100755
+--- a/lsof_4.84_src/Configure
++++ b/lsof_4.84_src/Configure
+@@ -4810,14 +4810,6 @@ return(0); }
+     # environment, establish their likely locations.
+ 
+     LSOF_TMP2=$SOLARIS_VXFSINCL
+-    if test -d /opt/VRTS/include	# {
+-    then
+-      LSOF_TMP2="$LSOF_TMP2 /opt/VRTS/include"
+-    fi	# }
+-    if test -d /opt/VRTSvxfs/include	# {
+-    then
+-      LSOF_TMP2="$LSOF_TMP2 /opt/VRTSvxfs/include"
+-    fi	# }
+     LSOF_TMP1=0
+     for i in $LSOF_TMP2	# {
+     do
+-- 
+1.7.6
+


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