Correct patch hunk sequence, remove ZFS hack, and use parallel make.

Fri, 03 Aug 2012 16:51:55 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Fri, 03 Aug 2012 16:51:55 +0200
changeset 465
6a12068a8ac8
parent 464
3e2a08d916c6
child 466
edc7e45b466a

Correct patch hunk sequence, remove ZFS hack, and use parallel make.

lsof/lsof.patch file | annotate | diff | comparison | revisions
lsof/lsof.spec file | annotate | diff | comparison | revisions
     1.1 --- a/lsof/lsof.patch	Fri Aug 03 16:49:08 2012 +0200
     1.2 +++ b/lsof/lsof.patch	Fri Aug 03 16:51:55 2012 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  Index: Configure
     1.5 ---- Configure.orig	2010-01-18 20:01:14 +0100
     1.6 -+++ Configure	2010-01-19 20:14:11 +0100
     1.7 -@@ -443,7 +443,7 @@
     1.8 +--- Configure.orig	2012-04-10 18:35:48.000000000 +0200
     1.9 ++++ Configure	2012-08-03 12:18:36.290850960 +0200
    1.10 +@@ -440,7 +440,7 @@
    1.11         fi	# }
    1.12       fi	# }
    1.13       LSOF_TGT="aix"
    1.14 @@ -10,7 +10,7 @@
    1.15       if test $? -eq 0	# {
    1.16       then
    1.17   
    1.18 -@@ -597,7 +597,7 @@
    1.19 +@@ -594,7 +594,7 @@
    1.20   
    1.21   	    rm -f dialects/aix/aix5/j2/j2_snapshot.h
    1.22   	  fi	# }
    1.23 @@ -19,7 +19,7 @@
    1.24   	  if test $? -eq 0	# {
    1.25   	  then
    1.26   
    1.27 -@@ -635,7 +635,7 @@
    1.28 +@@ -632,7 +632,7 @@
    1.29         # This is AIX >= 5 on ia64.
    1.30   
    1.31   	LSOF_TSTK64=1
    1.32 @@ -28,7 +28,7 @@
    1.33   	if test $? -eq 0	# {
    1.34   	then
    1.35   
    1.36 -@@ -712,7 +712,7 @@
    1.37 +@@ -709,7 +709,7 @@
    1.38   	  fi	# }
    1.39   	  LSOF_TSTK64=1
    1.40   	  LSOF_TMP1=1
    1.41 @@ -37,7 +37,7 @@
    1.42   	  if test $? -eq 0	# {
    1.43   	  then
    1.44   	    LSOF_CFGF="$LSOF_CFGF -maix64"
    1.45 -@@ -759,7 +759,7 @@
    1.46 +@@ -756,7 +756,7 @@
    1.47       fi	#}
    1.48       LSOF_CFGF="$LSOF_CFGF -DAIXV=$LSOF_VERS"
    1.49       LSOF_DIALECT_DIR=aix
    1.50 @@ -46,7 +46,7 @@
    1.51       if test $? -eq 0 	# {
    1.52       then
    1.53   
    1.54 -@@ -2239,7 +2239,7 @@
    1.55 +@@ -2269,7 +2269,7 @@
    1.56   	fi	# }
    1.57         fi	# }
    1.58       fi	# }
    1.59 @@ -55,7 +55,7 @@
    1.60       if test $? -eq 0	# {
    1.61       then
    1.62         LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
    1.63 -@@ -2293,7 +2293,7 @@
    1.64 +@@ -2323,7 +2323,7 @@
    1.65         then
    1.66   	LSOF_CFGF="$LSOF_CFGF -Ae +DD32"
    1.67         else
    1.68 @@ -64,7 +64,7 @@
    1.69   	if test $? -ne 0	# {
    1.70   	then
    1.71   	  LSOF_CFGF="$LSOF_CFGF +DD32"
    1.72 -@@ -2377,7 +2377,7 @@
    1.73 +@@ -2407,7 +2407,7 @@
    1.74   	    echo "* NOTICE!  Configuring for 64 bit HP-UX *"
    1.75   	    echo "*                                       *"
    1.76   	    echo "*****************************************"
    1.77 @@ -73,7 +73,7 @@
    1.78   	    if test $? -eq 0	# {
    1.79   	    then
    1.80   
    1.81 -@@ -2446,7 +2446,7 @@
    1.82 +@@ -2476,7 +2476,7 @@
    1.83   	  else
    1.84   	    LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64"
    1.85   	    LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX"
    1.86 @@ -82,7 +82,7 @@
    1.87   	    if test $? -ne 0	# {
    1.88   	    then
    1.89   	      LSOF_CFGF="$LSOF_CFGF +DAportable"
    1.90 -@@ -3655,7 +3655,7 @@
    1.91 +@@ -3710,7 +3710,7 @@
    1.92   	LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
    1.93         fi	# }
    1.94       fi	# }
    1.95 @@ -91,7 +91,7 @@
    1.96       if test $? -eq 0	# {
    1.97       then
    1.98         LSOF_CFGL="$LSOF_CFGL -w"
    1.99 -@@ -4300,6 +4300,9 @@
   1.100 +@@ -4355,6 +4355,9 @@
   1.101   	LSOF_TSTBIGF=" "
   1.102   	LSOF_TSTLFLG="-lsocket -lnsl"
   1.103   	LSOF_VERS="100000"
   1.104 @@ -101,7 +101,7 @@
   1.105   	;;
   1.106         5.11*)
   1.107   	LSOF_TSTBIGF=" "
   1.108 -@@ -4391,7 +4394,7 @@
   1.109 +@@ -4446,7 +4449,7 @@
   1.110   	echo "main(){" >> ${LSOF_TMPC}.c
   1.111   	echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c
   1.112   	echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC"
   1.113 @@ -110,7 +110,7 @@
   1.114   	if test $? -eq 0	# {
   1.115   	then
   1.116   	  $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x  > /dev/null 2>&1
   1.117 -@@ -4416,7 +4419,7 @@
   1.118 +@@ -4471,7 +4474,7 @@
   1.119   	echo "main(){" >> ${LSOF_TMPC}.c
   1.120   	echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c
   1.121   	echo "Testing prdata.h for PR_LDT, using $LSOF_CC"
   1.122 @@ -119,7 +119,7 @@
   1.123   	if test $? -eq 0	# {
   1.124   	then
   1.125   	  $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
   1.126 -@@ -4450,7 +4453,7 @@
   1.127 +@@ -4505,7 +4508,7 @@
   1.128   	echo $SOLARIS_KERNBITS | grep 64 > /dev/null
   1.129   	if test $? -eq 0	# {
   1.130   	then
   1.131 @@ -128,16 +128,7 @@
   1.132   	  if test $? -eq 0	# {
   1.133   	  then
   1.134   
   1.135 -@@ -4669,7 +4672,7 @@
   1.136 -       then
   1.137 - 	LSOF_CTFH=1
   1.138 -       fi	# }
   1.139 --      if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h	# {
   1.140 -+      if false	# {
   1.141 -       then
   1.142 - 	if test $LSOF_CTFH -eq 1	# {
   1.143 - 	then
   1.144 -@@ -4729,7 +4732,7 @@
   1.145 +@@ -4836,7 +4839,7 @@
   1.146         echo "main(){" >> ${LSOF_TMPC}.c
   1.147         echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c
   1.148         echo "Testing vnode.h for VSOCK, using $LSOF_CC"
   1.149 @@ -146,7 +137,7 @@
   1.150         if test $? -eq 0	# {
   1.151         then
   1.152   	$LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
   1.153 -@@ -5418,7 +5421,7 @@
   1.154 +@@ -5525,7 +5528,7 @@
   1.155       echo "$i" >> $LSOF_TSTCFLG
   1.156     done	# }
   1.157   fi	# }
   1.158 @@ -156,8 +147,8 @@
   1.159   then
   1.160     echo "-DLT_GCC" >> $LSOF_TSTCFLG
   1.161  Index: dialects/freebsd/machine.h
   1.162 ---- dialects/freebsd/machine.h.orig	2008-10-21 18:16:15 +0200
   1.163 -+++ dialects/freebsd/machine.h	2010-01-19 19:16:39 +0100
   1.164 +--- dialects/freebsd/machine.h.orig	2010-07-29 18:04:31.000000000 +0200
   1.165 ++++ dialects/freebsd/machine.h	2012-08-03 12:18:36.291289597 +0200
   1.166  @@ -441,6 +441,11 @@
   1.167    */
   1.168   
   1.169 @@ -171,9 +162,9 @@
   1.170   
   1.171   /*
   1.172  Index: dialects/sun/machine.h
   1.173 ---- dialects/sun/machine.h.orig	2009-03-25 20:22:23 +0100
   1.174 -+++ dialects/sun/machine.h	2010-01-19 19:16:39 +0100
   1.175 -@@ -84,6 +84,7 @@
   1.176 +--- dialects/sun/machine.h.orig	2011-09-07 21:16:07.000000000 +0200
   1.177 ++++ dialects/sun/machine.h	2012-08-03 12:18:36.291671855 +0200
   1.178 +@@ -105,6 +105,7 @@
   1.179   #include <sys/poll.h>
   1.180   
   1.181   # if	solaris>=80000
     2.1 --- a/lsof/lsof.spec	Fri Aug 03 16:49:08 2012 +0200
     2.2 +++ b/lsof/lsof.spec	Fri Aug 03 16:51:55 2012 +0200
     2.3 @@ -32,7 +32,7 @@
     2.4  Group:        Debugging
     2.5  License:      BSD
     2.6  Version:      4.86
     2.7 -Release:      20120603
     2.8 +Release:      20120800
     2.9  
    2.10  #   list of sources
    2.11  Source0:      ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_%{version}.tar.gz
    2.12 @@ -63,7 +63,7 @@
    2.13      cd lsof_%{version}_src
    2.14      export PATH="/bin:/usr/bin:$PATH"
    2.15      export LSOF_CC="%{l_cc}"
    2.16 -    export LSOF_MAKE="%{l_make} %{l_mflags}"
    2.17 +    export LSOF_MAKE="%{l_make} %{l_mflags -O}"
    2.18      case "%{l_platform -t}" in
    2.19          *-freebsd* ) platform="freebsd"; LSOF_CC="/usr/bin/cc"; LSOF_MAKE="/usr/bin/make" ;;
    2.20          *-linux*   ) platform="linux"   ;;

mercurial