lsof/lsof.patch@78e7deb1d6ab
lsof/lsof.patch
Wed, 14 Jan 2009 15:59:12 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 14 Jan 2009 15:59:12 +0100
- changeset 86
- 78e7deb1d6ab
- parent 34
- 673ed164f8e5
- child 125
- 06debe70afb4
- permissions
- -rw-r--r--
Correct and improve many buildconf and code logic blocks. In particular:
1. Document potential problems building with current binutils releases.
2. Document the flawed webkit and explain its temporary exclusion.
3. Document the edition of Qt which is built and installed.
4. Remove the Solaris x11_supdir logic as it is no longer found.
5. Correct several .pr[io] files including QMAKE_CXXFLAGS and INCPATH,
which previously caused preexisting Qt installations to deliver
erroneous old include and library logic instead of relying on
that of the currently building package. -I/opkg/include is now
placed at the end of the compile statements.
6. Don't trust the QMAKE_[INC|LIB]DIR_X11 identifiers in qmake.conf.
7. Allow more 64-bit builds and more properly identify the platform.
8. Place plugins (which are shared objects) in lib instead of share.
9. Build components as plugins when possible if with_shared is enabled.
10. Translate German text to English to be more consistent.
11. Instead of removing the pkgconfig directory of with_shared builds,
place it in a child directory useful for shared building.
12. Document the nonstandard shared build directory structure,
including using the hidden pkgconfig directory (PKG_CONFIG_PATH.)
13. Change %doc to specify files rather than directories in the RPM DB.
1 Index: Configure
2 --- Configure.orig 2008-04-15 15:24:36 +0200
3 +++ Configure 2008-04-16 08:19:20 +0200
4 @@ -417,7 +417,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
13 @@ -571,7 +571,7 @@
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
22 @@ -609,7 +609,7 @@
23 # This is AIX >= 5 on ia64.
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
31 @@ -686,7 +686,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 @@ -733,7 +733,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
49 @@ -2134,7 +2134,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 @@ -2188,7 +2188,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 @@ -2272,7 +2272,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
76 @@ -2341,7 +2341,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 @@ -3550,7 +3550,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 @@ -4187,6 +4187,17 @@
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 + 5.11*)
103 + LSOF_TSTBIGF=" "
104 + LSOF_TSTLFLG="-lsocket -lnsl"
105 + LSOF_VERS="110000"
106 + if [ ".`isainfo -k`" = .amd64 ]; then
107 + LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil"
108 + fi
109 ;;
110 *)
111 echo Unknown Solaris version: $LSOF_VSTR
112 @@ -4264,7 +4275,7 @@
113 ;;
114 20500|20501)
115 ;;
116 - 20600|70000|80000|90000|100000)
117 + 20600|70000|80000|90000|100000|110000)
118 if test "X$SOLARIS_26PR_GWINDOWS" = "X" # {
119 then
120 rm -f ${LSOF_TMPC}.*
121 @@ -4273,7 +4284,7 @@
122 echo "main(){" >> ${LSOF_TMPC}.c
123 echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c
124 echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC"
125 - echo $LSOF_CC | grep gcc > /dev/null
126 + $LSOF_CC --version | grep GCC > /dev/null
127 if test $? -eq 0 # {
128 then
129 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
130 @@ -4298,7 +4309,7 @@
131 echo "main(){" >> ${LSOF_TMPC}.c
132 echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c
133 echo "Testing prdata.h for PR_LDT, using $LSOF_CC"
134 - echo $LSOF_CC | grep gcc > /dev/null
135 + $LSOF_CC --version | grep GCC > /dev/null
136 if test $? -eq 0 # {
137 then
138 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
139 @@ -4328,7 +4339,7 @@
140 echo $SOLARIS_KERNBITS | grep 64 > /dev/null
141 if test $? -eq 0 # {
142 then
143 - echo $LSOF_CC | grep gcc > /dev/null
144 + $LSOF_CC --version | grep GCC > /dev/null
145 if test $? -eq 0 # {
146 then
148 @@ -4532,7 +4543,7 @@
150 # Check for Solaris 10 or higher ZFS.
152 - if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h # {
153 + if false # {
154 then
155 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"
156 LSOF_TMP2=""
157 @@ -4615,7 +4626,7 @@
158 echo "main(){" >> ${LSOF_TMPC}.c
159 echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c
160 echo "Testing vnode.h for VSOCK, using $LSOF_CC"
161 - echo $LSOF_CC | grep gcc > /dev/null
162 + $LSOF_CC --version | grep GCC > /dev/null
163 if test $? -eq 0 # {
164 then
165 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
166 @@ -5295,7 +5306,7 @@
167 echo "$i" >> $LSOF_TSTCFLG
168 done # }
169 fi # }
170 -echo $LSOF_CC | grep gcc > /dev/null 2>&1
171 +$LSOF_CC --version | grep GCC > /dev/null 2>&1
172 if test $? -eq 0 # {
173 then
174 echo "-DLT_GCC" >> $LSOF_TSTCFLG
175 Index: dialects/sun/dnode.c
176 --- dialects/sun/dnode.c.orig 2008-10-21 18:16:45.000000000 +0200
177 +++ dialects/sun/dnode.c 2009-01-08 01:59:20.609120000 +0100
178 @@ -85,6 +85,8 @@
179 #define LOOKDEV_ALL (LOOKDEV_TAB | LOOKDEV_CLONE | LOOKDEV_PSEUDO)
180 /* look all places */
182 +#define NOOP ((void)0)
183 +
185 /*
186 * SAM-FS definitions
187 @@ -2065,7 +2067,9 @@
188 if (kvs && kv.vfs_data
189 && !kread((KA_T)kv.vfs_data, (char *)&pcfs, sizeof(pcfs))) {
191 -#if solaris>=70000
192 +#if solaris>=110000 /* pcfs_entps doesn't exist any more */
193 + NOOP;
194 +#elif solaris>=70000
195 Lf->inode = (INODETYPE)pc_makenodeid(pc.pc_eblkno,
196 pc.pc_eoffset,
197 pc.pc_entry.pcd_attr,
198 @@ -2079,7 +2083,7 @@
199 pc.pc_eoffset,
200 &pc.pc_entry,
201 pcfs.pcfs_entps);
202 -#endif /* solaris>=70000 */
203 +#endif /* solaris>=110000 */
205 Lf->inp_ty = 1;
206 }
207 Index: dialects/freebsd/machine.h
208 --- dialects/freebsd/machine.h.orig 2006-03-28 01:29:14 +0200
209 +++ dialects/freebsd/machine.h 2008-04-16 08:17:46 +0200
210 @@ -441,6 +441,11 @@
211 */
213 /* #define HASSECURITY 1 */
214 +#if FREEBSDV>=6000
215 +#define HASSECURITY 1
216 +#define HAS_SI_PRIV 1
217 +#endif /* FREEBSDV>=6000 */
218 +
221 /*
222 Index: dialects/sun/machine.h
223 --- dialects/sun/machine.h.orig 2007-04-24 18:23:25 +0200
224 +++ dialects/sun/machine.h 2008-04-16 08:17:46 +0200
225 @@ -75,6 +75,7 @@
226 #include <sys/poll.h>
228 # if solaris>=80000
229 +#include <sys/types32.h>
230 #include <sys/wait.h>
231 #include <sys/types32.h>
232 #define _KERNEL 1
233 Index: proc.c
234 --- proc.c.orig 2008-10-21 18:22:05.000000000 +0200
235 +++ proc.c 2009-01-08 01:13:31.388963909 +0100
236 @@ -841,8 +841,6 @@
237 {
238 if (Lf->sf & SELEXCLF)
239 return;
240 - if (((Selflags & SELNET) == SELNET) && !(Lf->sf & SELNET))
241 - return;
242 Lp->pss |= PS_SEC;
243 if (Plf)
244 Plf->next = Lf;
