OpenPKG Specs / file comparison

comparison: lsof/lsof.patch

lsof/lsof.patch

changeset 782
de3379343a7c
parent 464
3e2a08d916c6
equal deleted inserted replaced
3:d85305ebd42c 4:208b3943c07b
1 Index: Configure 1 Index: Configure
2 --- Configure.orig 2010-01-18 20:01:14 +0100 2 --- Configure.orig 2012-04-10 18:35:48.000000000 +0200
3 +++ Configure 2010-01-19 20:14:11 +0100 3 +++ Configure 2012-08-03 12:18:36.290850960 +0200
4 @@ -443,7 +443,7 @@ 4 @@ -440,7 +440,7 @@
5 fi # } 5 fi # }
6 fi # } 6 fi # }
7 LSOF_TGT="aix" 7 LSOF_TGT="aix"
8 - echo $LSOF_CC | grep gcc > /dev/null 8 - echo $LSOF_CC | grep gcc > /dev/null
9 + $LSOF_CC --version | grep GCC > /dev/null 9 + $LSOF_CC --version | grep GCC > /dev/null
10 if test $? -eq 0 # { 10 if test $? -eq 0 # {
11 then 11 then
12 12
13 @@ -597,7 +597,7 @@ 13 @@ -594,7 +594,7 @@
14 14
15 rm -f dialects/aix/aix5/j2/j2_snapshot.h 15 rm -f dialects/aix/aix5/j2/j2_snapshot.h
16 fi # } 16 fi # }
17 - echo $LSOF_CC | grep gcc > /dev/null 17 - echo $LSOF_CC | grep gcc > /dev/null
18 + $LSOF_CC --version | grep GCC > /dev/null 18 + $LSOF_CC --version | grep GCC > /dev/null
19 if test $? -eq 0 # { 19 if test $? -eq 0 # {
20 then 20 then
21 21
22 @@ -635,7 +635,7 @@ 22 @@ -632,7 +632,7 @@
23 # This is AIX >= 5 on ia64. 23 # This is AIX >= 5 on ia64.
24 24
25 LSOF_TSTK64=1 25 LSOF_TSTK64=1
26 - echo $LSOF_CC | grep gcc > /dev/null 26 - echo $LSOF_CC | grep gcc > /dev/null
27 + $LSOF_CC --version | grep GCC > /dev/null 27 + $LSOF_CC --version | grep GCC > /dev/null
28 if test $? -eq 0 # { 28 if test $? -eq 0 # {
29 then 29 then
30 30
31 @@ -712,7 +712,7 @@ 31 @@ -709,7 +709,7 @@
32 fi # } 32 fi # }
33 LSOF_TSTK64=1 33 LSOF_TSTK64=1
34 LSOF_TMP1=1 34 LSOF_TMP1=1
35 - echo $LSOF_CC | grep gcc > /dev/null 35 - echo $LSOF_CC | grep gcc > /dev/null
36 + $LSOF_CC --version | grep GCC > /dev/null 36 + $LSOF_CC --version | grep GCC > /dev/null
37 if test $? -eq 0 # { 37 if test $? -eq 0 # {
38 then 38 then
39 LSOF_CFGF="$LSOF_CFGF -maix64" 39 LSOF_CFGF="$LSOF_CFGF -maix64"
40 @@ -759,7 +759,7 @@ 40 @@ -756,7 +756,7 @@
41 fi #} 41 fi #}
42 LSOF_CFGF="$LSOF_CFGF -DAIXV=$LSOF_VERS" 42 LSOF_CFGF="$LSOF_CFGF -DAIXV=$LSOF_VERS"
43 LSOF_DIALECT_DIR=aix 43 LSOF_DIALECT_DIR=aix
44 - echo $LSOF_CC | grep gcc > /dev/null 44 - echo $LSOF_CC | grep gcc > /dev/null
45 + $LSOF_CC --version | grep GCC > /dev/null 45 + $LSOF_CC --version | grep GCC > /dev/null
46 if test $? -eq 0 # { 46 if test $? -eq 0 # {
47 then 47 then
48 48
49 @@ -2239,7 +2239,7 @@ 49 @@ -2269,7 +2269,7 @@
50 fi # } 50 fi # }
51 fi # } 51 fi # }
52 fi # } 52 fi # }
53 - echo $LSOF_CC | grep gcc > /dev/null 53 - echo $LSOF_CC | grep gcc > /dev/null
54 + $LSOF_CC --version | grep GCC > /dev/null 54 + $LSOF_CC --version | grep GCC > /dev/null
55 if test $? -eq 0 # { 55 if test $? -eq 0 # {
56 then 56 then
57 LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'` 57 LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
58 @@ -2293,7 +2293,7 @@ 58 @@ -2323,7 +2323,7 @@
59 then 59 then
60 LSOF_CFGF="$LSOF_CFGF -Ae +DD32" 60 LSOF_CFGF="$LSOF_CFGF -Ae +DD32"
61 else 61 else
62 - echo $LSOF_CC | grep -q gcc 62 - echo $LSOF_CC | grep -q gcc
63 + $LSOF_CC --version | grep -q GCC 63 + $LSOF_CC --version | grep -q GCC
64 if test $? -ne 0 # { 64 if test $? -ne 0 # {
65 then 65 then
66 LSOF_CFGF="$LSOF_CFGF +DD32" 66 LSOF_CFGF="$LSOF_CFGF +DD32"
67 @@ -2377,7 +2377,7 @@ 67 @@ -2407,7 +2407,7 @@
68 echo "* NOTICE! Configuring for 64 bit HP-UX *" 68 echo "* NOTICE! Configuring for 64 bit HP-UX *"
69 echo "* *" 69 echo "* *"
70 echo "*****************************************" 70 echo "*****************************************"
71 - echo $LSOF_CC | grep gcc > /dev/null 71 - echo $LSOF_CC | grep gcc > /dev/null
72 + $LSOF_CC --version | grep GCC > /dev/null 72 + $LSOF_CC --version | grep GCC > /dev/null
73 if test $? -eq 0 # { 73 if test $? -eq 0 # {
74 then 74 then
75 75
76 @@ -2446,7 +2446,7 @@ 76 @@ -2476,7 +2476,7 @@
77 else 77 else
78 LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64" 78 LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64"
79 LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX" 79 LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX"
80 - echo $LSOF_CC | grep gcc > /dev/null 80 - echo $LSOF_CC | grep gcc > /dev/null
81 + $LSOF_CC --version | grep GCC > /dev/null 81 + $LSOF_CC --version | grep GCC > /dev/null
82 if test $? -ne 0 # { 82 if test $? -ne 0 # {
83 then 83 then
84 LSOF_CFGF="$LSOF_CFGF +DAportable" 84 LSOF_CFGF="$LSOF_CFGF +DAportable"
85 @@ -3655,7 +3655,7 @@ 85 @@ -3710,7 +3710,7 @@
86 LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'` 86 LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
87 fi # } 87 fi # }
88 fi # } 88 fi # }
89 - echo $LSOF_CC | grep gcc > /dev/null 89 - echo $LSOF_CC | grep gcc > /dev/null
90 + $LSOF_CC --version | grep GCC > /dev/null 90 + $LSOF_CC --version | grep GCC > /dev/null
91 if test $? -eq 0 # { 91 if test $? -eq 0 # {
92 then 92 then
93 LSOF_CFGL="$LSOF_CFGL -w" 93 LSOF_CFGL="$LSOF_CFGL -w"
94 @@ -4300,6 +4300,9 @@ 94 @@ -4355,6 +4355,9 @@
95 LSOF_TSTBIGF=" " 95 LSOF_TSTBIGF=" "
96 LSOF_TSTLFLG="-lsocket -lnsl" 96 LSOF_TSTLFLG="-lsocket -lnsl"
97 LSOF_VERS="100000" 97 LSOF_VERS="100000"
98 + if [ ".`isainfo -k`" = .amd64 ]; then 98 + if [ ".`isainfo -k`" = .amd64 ]; then
99 + LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil" 99 + LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil"
100 + fi 100 + fi
101 ;; 101 ;;
102 5.11*) 102 5.11*)
103 LSOF_TSTBIGF=" " 103 LSOF_TSTBIGF=" "
104 @@ -4391,7 +4394,7 @@ 104 @@ -4446,7 +4449,7 @@
105 echo "main(){" >> ${LSOF_TMPC}.c 105 echo "main(){" >> ${LSOF_TMPC}.c
106 echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c 106 echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c
107 echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC" 107 echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC"
108 - echo $LSOF_CC | grep gcc > /dev/null 108 - echo $LSOF_CC | grep gcc > /dev/null
109 + $LSOF_CC --version | grep GCC > /dev/null 109 + $LSOF_CC --version | grep GCC > /dev/null
110 if test $? -eq 0 # { 110 if test $? -eq 0 # {
111 then 111 then
112 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 112 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
113 @@ -4416,7 +4419,7 @@ 113 @@ -4471,7 +4474,7 @@
114 echo "main(){" >> ${LSOF_TMPC}.c 114 echo "main(){" >> ${LSOF_TMPC}.c
115 echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c 115 echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c
116 echo "Testing prdata.h for PR_LDT, using $LSOF_CC" 116 echo "Testing prdata.h for PR_LDT, using $LSOF_CC"
117 - echo $LSOF_CC | grep gcc > /dev/null 117 - echo $LSOF_CC | grep gcc > /dev/null
118 + $LSOF_CC --version | grep GCC > /dev/null 118 + $LSOF_CC --version | grep GCC > /dev/null
119 if test $? -eq 0 # { 119 if test $? -eq 0 # {
120 then 120 then
121 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 121 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
122 @@ -4450,7 +4453,7 @@ 122 @@ -4505,7 +4508,7 @@
123 echo $SOLARIS_KERNBITS | grep 64 > /dev/null 123 echo $SOLARIS_KERNBITS | grep 64 > /dev/null
124 if test $? -eq 0 # { 124 if test $? -eq 0 # {
125 then 125 then
126 - echo $LSOF_CC | grep gcc > /dev/null 126 - echo $LSOF_CC | grep gcc > /dev/null
127 + $LSOF_CC --version | grep GCC > /dev/null 127 + $LSOF_CC --version | grep GCC > /dev/null
128 if test $? -eq 0 # { 128 if test $? -eq 0 # {
129 then 129 then
130 130
131 @@ -4669,7 +4672,7 @@ 131 @@ -4836,7 +4839,7 @@
132 then
133 LSOF_CTFH=1
134 fi # }
135 - if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h # {
136 + if false # {
137 then
138 if test $LSOF_CTFH -eq 1 # {
139 then
140 @@ -4729,7 +4732,7 @@
141 echo "main(){" >> ${LSOF_TMPC}.c 132 echo "main(){" >> ${LSOF_TMPC}.c
142 echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c 133 echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c
143 echo "Testing vnode.h for VSOCK, using $LSOF_CC" 134 echo "Testing vnode.h for VSOCK, using $LSOF_CC"
144 - echo $LSOF_CC | grep gcc > /dev/null 135 - echo $LSOF_CC | grep gcc > /dev/null
145 + $LSOF_CC --version | grep GCC > /dev/null 136 + $LSOF_CC --version | grep GCC > /dev/null
146 if test $? -eq 0 # { 137 if test $? -eq 0 # {
147 then 138 then
148 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 139 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
149 @@ -5418,7 +5421,7 @@ 140 @@ -5525,7 +5528,7 @@
150 echo "$i" >> $LSOF_TSTCFLG 141 echo "$i" >> $LSOF_TSTCFLG
151 done # } 142 done # }
152 fi # } 143 fi # }
153 -echo $LSOF_CC | grep gcc > /dev/null 2>&1 144 -echo $LSOF_CC | grep gcc > /dev/null 2>&1
154 +$LSOF_CC --version | grep GCC > /dev/null 2>&1 145 +$LSOF_CC --version | grep GCC > /dev/null 2>&1
155 if test $? -eq 0 # { 146 if test $? -eq 0 # {
156 then 147 then
157 echo "-DLT_GCC" >> $LSOF_TSTCFLG 148 echo "-DLT_GCC" >> $LSOF_TSTCFLG
158 Index: dialects/freebsd/machine.h 149 Index: dialects/freebsd/machine.h
159 --- dialects/freebsd/machine.h.orig 2008-10-21 18:16:15 +0200 150 --- dialects/freebsd/machine.h.orig 2010-07-29 18:04:31.000000000 +0200
160 +++ dialects/freebsd/machine.h 2010-01-19 19:16:39 +0100 151 +++ dialects/freebsd/machine.h 2012-08-03 12:18:36.291289597 +0200
161 @@ -441,6 +441,11 @@ 152 @@ -441,6 +441,11 @@
162 */ 153 */
163 154
164 /* #define HASSECURITY 1 */ 155 /* #define HASSECURITY 1 */
165 +#if FREEBSDV>=6000 156 +#if FREEBSDV>=6000
169 + 160 +
170 161
171 162
172 /* 163 /*
173 Index: dialects/sun/machine.h 164 Index: dialects/sun/machine.h
174 --- dialects/sun/machine.h.orig 2009-03-25 20:22:23 +0100 165 --- dialects/sun/machine.h.orig 2011-09-07 21:16:07.000000000 +0200
175 +++ dialects/sun/machine.h 2010-01-19 19:16:39 +0100 166 +++ dialects/sun/machine.h 2012-08-03 12:18:36.291671855 +0200
176 @@ -84,6 +84,7 @@ 167 @@ -105,6 +105,7 @@
177 #include <sys/poll.h> 168 #include <sys/poll.h>
178 169
179 # if solaris>=80000 170 # if solaris>=80000
180 +#include <sys/types32.h> 171 +#include <sys/types32.h>
181 #include <sys/wait.h> 172 #include <sys/wait.h>

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial