OpenPKG Specs / annotate

lsof/lsof.patch@9dacbd1d1aa2 (annotated)

lsof/lsof.patch

Fri, 07 Sep 2012 19:08:07 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Fri, 07 Sep 2012 19:08:07 +0200
changeset 667
9dacbd1d1aa2
parent 464
3e2a08d916c6
permissions
-rw-r--r--

Correct build configuration in Solaris subdir, correct english grammar,
remove irrelevant strip notice, introduce custom CFLAG logic, facilitate
use of Solaris Studio compiler with needed build configuration
adjustments, conditionally build 64 bit position independent code,
and accommodate tun(7) in newer Solaris releases by renaming driver
and module from conflicting 'tun' to 'vtun'. These changes include
some nonstandard 'I give up' logic causing out of tree builds by
manipulating the PATH, for example.

michael@34 1 Index: Configure
michael@465 2 --- Configure.orig 2012-04-10 18:35:48.000000000 +0200
michael@465 3 +++ Configure 2012-08-03 12:18:36.290850960 +0200
michael@465 4 @@ -440,7 +440,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@465 13 @@ -594,7 +594,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@465 22 @@ -632,7 +632,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@465 31 @@ -709,7 +709,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@465 40 @@ -756,7 +756,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@465 49 @@ -2269,7 +2269,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@465 58 @@ -2323,7 +2323,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@465 67 @@ -2407,7 +2407,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@465 76 @@ -2476,7 +2476,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@465 85 @@ -3710,7 +3710,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@464 93 LSOF_CFGL="$LSOF_CFGL -w"
michael@465 94 @@ -4355,6 +4355,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@464 102 5.11*)
michael@464 103 LSOF_TSTBIGF=" "
michael@465 104 @@ -4446,7 +4449,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@465 113 @@ -4471,7 +4474,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@465 122 @@ -4505,7 +4508,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@465 131 @@ -4836,7 +4839,7 @@
michael@34 132 echo "main(){" >> ${LSOF_TMPC}.c
michael@34 133 echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c
michael@34 134 echo "Testing vnode.h for VSOCK, using $LSOF_CC"
michael@34 135 - echo $LSOF_CC | grep gcc > /dev/null
michael@34 136 + $LSOF_CC --version | grep GCC > /dev/null
michael@34 137 if test $? -eq 0 # {
michael@34 138 then
michael@34 139 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
michael@465 140 @@ -5525,7 +5528,7 @@
michael@34 141 echo "$i" >> $LSOF_TSTCFLG
michael@34 142 done # }
michael@34 143 fi # }
michael@34 144 -echo $LSOF_CC | grep gcc > /dev/null 2>&1
michael@34 145 +$LSOF_CC --version | grep GCC > /dev/null 2>&1
michael@34 146 if test $? -eq 0 # {
michael@34 147 then
michael@34 148 echo "-DLT_GCC" >> $LSOF_TSTCFLG
michael@125 149 Index: dialects/freebsd/machine.h
michael@465 150 --- dialects/freebsd/machine.h.orig 2010-07-29 18:04:31.000000000 +0200
michael@465 151 +++ dialects/freebsd/machine.h 2012-08-03 12:18:36.291289597 +0200
michael@125 152 @@ -441,6 +441,11 @@
michael@125 153 */
michael@125 154
michael@125 155 /* #define HASSECURITY 1 */
michael@125 156 +#if FREEBSDV>=6000
michael@125 157 +#define HASSECURITY 1
michael@125 158 +#define HAS_SI_PRIV 1
michael@125 159 +#endif /* FREEBSDV>=6000 */
michael@125 160 +
michael@125 161
michael@125 162
michael@125 163 /*
michael@464 164 Index: dialects/sun/machine.h
michael@465 165 --- dialects/sun/machine.h.orig 2011-09-07 21:16:07.000000000 +0200
michael@465 166 +++ dialects/sun/machine.h 2012-08-03 12:18:36.291671855 +0200
michael@465 167 @@ -105,6 +105,7 @@
michael@464 168 #include <sys/poll.h>
michael@36 169
michael@464 170 # if solaris>=80000
michael@464 171 +#include <sys/types32.h>
michael@464 172 #include <sys/wait.h>
michael@464 173 #include <sys/types32.h>
michael@464 174 #define _KERNEL 1

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial