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