comparison: lsof/lsof.patch
lsof/lsof.patch
- changeset 34
- 673ed164f8e5
- child 36
- 88242dc55a66
equal
deleted
inserted
replaced
| -1:000000000000 | 0:40b3b568d68a |
|---|---|
| 1 Index: Configure | |
| 2 --- Configure.orig 2008-04-15 15:24:36 +0200 | |
| 3 +++ Configure 2008-04-16 08:19:20 +0200 | |
| 4 @@ -413,7 +413,7 @@ | |
| 5 fi # } | |
| 6 fi # } | |
| 7 LSOF_TGT="aix" | |
| 8 - echo $LSOF_CC | grep gcc > /dev/null | |
| 9 + $LSOF_CC --version | grep GCC > /dev/null | |
| 10 if test $? -eq 0 # { | |
| 11 then | |
| 12 | |
| 13 @@ -567,7 +567,7 @@ | |
| 14 | |
| 15 rm -f dialects/aix/aix5/j2/j2_snapshot.h | |
| 16 fi # } | |
| 17 - echo $LSOF_CC | grep gcc > /dev/null | |
| 18 + $LSOF_CC --version | grep GCC > /dev/null | |
| 19 if test $? -eq 0 # { | |
| 20 then | |
| 21 | |
| 22 @@ -605,7 +605,7 @@ | |
| 23 # This is AIX >= 5 on ia64. | |
| 24 | |
| 25 LSOF_TSTK64=1 | |
| 26 - echo $LSOF_CC | grep gcc > /dev/null | |
| 27 + $LSOF_CC --version | grep GCC > /dev/null | |
| 28 if test $? -eq 0 # { | |
| 29 then | |
| 30 | |
| 31 @@ -682,7 +682,7 @@ | |
| 32 fi # } | |
| 33 LSOF_TSTK64=1 | |
| 34 LSOF_TMP1=1 | |
| 35 - echo $LSOF_CC | grep gcc > /dev/null | |
| 36 + $LSOF_CC --version | grep GCC > /dev/null | |
| 37 if test $? -eq 0 # { | |
| 38 then | |
| 39 LSOF_CFGF="$LSOF_CFGF -maix64" | |
| 40 @@ -729,7 +729,7 @@ | |
| 41 fi #} | |
| 42 LSOF_CFGF="$LSOF_CFGF -DAIXV=$LSOF_VERS" | |
| 43 LSOF_DIALECT_DIR=aix | |
| 44 - echo $LSOF_CC | grep gcc > /dev/null | |
| 45 + $LSOF_CC --version | grep GCC > /dev/null | |
| 46 if test $? -eq 0 # { | |
| 47 then | |
| 48 | |
| 49 @@ -1995,7 +1995,7 @@ | |
| 50 fi # } | |
| 51 fi # } | |
| 52 fi # } | |
| 53 - echo $LSOF_CC | grep gcc > /dev/null | |
| 54 + $LSOF_CC --version | grep GCC > /dev/null | |
| 55 if test $? -eq 0 # { | |
| 56 then | |
| 57 LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'` | |
| 58 @@ -2047,7 +2047,7 @@ | |
| 59 then | |
| 60 LSOF_CFGF="$LSOF_CFGF -Ae +DD32" | |
| 61 else | |
| 62 - echo $LSOF_CC | grep -q gcc | |
| 63 + $LSOF_CC --version | grep -q GCC | |
| 64 if test $? -ne 0 # { | |
| 65 then | |
| 66 LSOF_CFGF="$LSOF_CFGF +DD32" | |
| 67 @@ -2127,7 +2127,7 @@ | |
| 68 echo "* NOTICE! Configuring for 64 bit HP-UX *" | |
| 69 echo "* *" | |
| 70 echo "*****************************************" | |
| 71 - echo $LSOF_CC | grep gcc > /dev/null | |
| 72 + $LSOF_CC --version | grep GCC > /dev/null | |
| 73 if test $? -eq 0 # { | |
| 74 then | |
| 75 | |
| 76 @@ -2196,7 +2196,7 @@ | |
| 77 else | |
| 78 LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64" | |
| 79 LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX" | |
| 80 - echo $LSOF_CC | grep gcc > /dev/null | |
| 81 + $LSOF_CC --version | grep GCC > /dev/null | |
| 82 if test $? -ne 0 # { | |
| 83 then | |
| 84 LSOF_CFGF="$LSOF_CFGF +DAportable" | |
| 85 @@ -3403,7 +3403,7 @@ | |
| 86 LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'` | |
| 87 fi # } | |
| 88 fi # } | |
| 89 - echo $LSOF_CC | grep gcc > /dev/null | |
| 90 + $LSOF_CC --version | grep GCC > /dev/null | |
| 91 if test $? -eq 0 # { | |
| 92 then | |
| 93 LSOF_CFGL="-w" | |
| 94 @@ -4040,6 +4040,9 @@ | |
| 95 LSOF_TSTBIGF=" " | |
| 96 LSOF_TSTLFLG="-lsocket -lnsl" | |
| 97 LSOF_VERS="100000" | |
| 98 + if [ ".`isainfo -k`" = .amd64 ]; then | |
| 99 + LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil" | |
| 100 + fi | |
| 101 ;; | |
| 102 *) | |
| 103 echo Unknown Solaris version: $LSOF_VSTR | |
| 104 @@ -4118,7 +4121,7 @@ | |
| 105 echo "main(){" >> ${LSOF_TMPC}.c | |
| 106 echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c | |
| 107 echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC" | |
| 108 - echo $LSOF_CC | grep gcc > /dev/null | |
| 109 + $LSOF_CC --version | grep GCC > /dev/null | |
| 110 if test $? -eq 0 # { | |
| 111 then | |
| 112 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 | |
| 113 @@ -4143,7 +4146,7 @@ | |
| 114 echo "main(){" >> ${LSOF_TMPC}.c | |
| 115 echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c | |
| 116 echo "Testing prdata.h for PR_LDT, using $LSOF_CC" | |
| 117 - echo $LSOF_CC | grep gcc > /dev/null | |
| 118 + $LSOF_CC --version | grep GCC > /dev/null | |
| 119 if test $? -eq 0 # { | |
| 120 then | |
| 121 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 | |
| 122 @@ -4173,7 +4176,7 @@ | |
| 123 echo $SOLARIS_KERNBITS | grep 64 > /dev/null | |
| 124 if test $? -eq 0 # { | |
| 125 then | |
| 126 - echo $LSOF_CC | grep gcc > /dev/null | |
| 127 + $LSOF_CC --version | grep GCC > /dev/null | |
| 128 if test $? -eq 0 # { | |
| 129 then | |
| 130 | |
| 131 @@ -4377,7 +4380,7 @@ | |
| 132 | |
| 133 # Check for Solaris 10 or higher ZFS. | |
| 134 | |
| 135 - if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h # { | |
| 136 + if false # { | |
| 137 then | |
| 138 LSOF_TMP1="dmu.h zfs_acl.h zfs_debug.h zfs_rlock.h zil.h spa.h zfs_context.h zfs_dir.h zfs_vfsops.h zio.h txg.h zfs_ctldir.h zfs_ioctl.h zfs_znode.h zio_impl.h" | |
| 139 LSOF_TMP2="" | |
| 140 @@ -4460,7 +4463,7 @@ | |
| 141 echo "main(){" >> ${LSOF_TMPC}.c | |
| 142 echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c | |
| 143 echo "Testing vnode.h for VSOCK, using $LSOF_CC" | |
| 144 - echo $LSOF_CC | grep gcc > /dev/null | |
| 145 + $LSOF_CC --version | grep GCC > /dev/null | |
| 146 if test $? -eq 0 # { | |
| 147 then | |
| 148 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 | |
| 149 @@ -5139,7 +5142,7 @@ | |
| 150 echo "$i" >> $LSOF_TSTCFLG | |
| 151 done # } | |
| 152 fi # } | |
| 153 -echo $LSOF_CC | grep gcc > /dev/null 2>&1 | |
| 154 +$LSOF_CC --version | grep GCC > /dev/null 2>&1 | |
| 155 if test $? -eq 0 # { | |
| 156 then | |
| 157 echo "-DLT_GCC" >> $LSOF_TSTCFLG | |
| 158 Index: dialects/freebsd/machine.h | |
| 159 --- dialects/freebsd/machine.h.orig 2006-03-28 01:29:14 +0200 | |
| 160 +++ dialects/freebsd/machine.h 2008-04-16 08:17:46 +0200 | |
| 161 @@ -436,6 +436,11 @@ | |
| 162 */ | |
| 163 | |
| 164 /* #define HASSECURITY 1 */ | |
| 165 +#if FREEBSDV>=6000 | |
| 166 +#define HASSECURITY 1 | |
| 167 +#define HAS_SI_PRIV 1 | |
| 168 +#endif /* FREEBSDV>=6000 */ | |
| 169 + | |
| 170 | |
| 171 | |
| 172 /* | |
| 173 Index: dialects/sun/machine.h | |
| 174 --- dialects/sun/machine.h.orig 2007-04-24 18:23:25 +0200 | |
| 175 +++ dialects/sun/machine.h 2008-04-16 08:17:46 +0200 | |
| 176 @@ -75,6 +75,7 @@ | |
| 177 #include <sys/poll.h> | |
| 178 | |
| 179 # if solaris>=80000 | |
| 180 +#include <sys/types32.h> | |
| 181 #include <sys/wait.h> | |
| 182 #include <sys/types32.h> | |
| 183 #define _KERNEL 1 |
