michael@34: Index: Configure
michael@464: --- Configure.orig	2010-01-18 20:01:14 +0100
michael@464: +++ Configure	2010-01-19 20:14:11 +0100
michael@464: @@ -443,7 +443,7 @@
michael@34:        fi	# }
michael@34:      fi	# }
michael@34:      LSOF_TGT="aix"
michael@34: -    echo $LSOF_CC | grep gcc > /dev/null
michael@34: +    $LSOF_CC --version | grep GCC > /dev/null
michael@34:      if test $? -eq 0	# {
michael@34:      then
michael@34:  
michael@464: @@ -597,7 +597,7 @@
michael@34:  
michael@34:  	    rm -f dialects/aix/aix5/j2/j2_snapshot.h
michael@34:  	  fi	# }
michael@34: -	  echo $LSOF_CC | grep gcc > /dev/null
michael@34: +	  $LSOF_CC --version | grep GCC > /dev/null
michael@34:  	  if test $? -eq 0	# {
michael@34:  	  then
michael@34:  
michael@464: @@ -635,7 +635,7 @@
michael@34:        # This is AIX >= 5 on ia64.
michael@34:  
michael@34:  	LSOF_TSTK64=1
michael@34: -	echo $LSOF_CC | grep gcc > /dev/null
michael@34: +	$LSOF_CC --version | grep GCC > /dev/null
michael@34:  	if test $? -eq 0	# {
michael@34:  	then
michael@34:  
michael@464: @@ -712,7 +712,7 @@
michael@34:  	  fi	# }
michael@34:  	  LSOF_TSTK64=1
michael@34:  	  LSOF_TMP1=1
michael@34: -	  echo $LSOF_CC | grep gcc > /dev/null
michael@34: +	  $LSOF_CC --version | grep GCC > /dev/null
michael@34:  	  if test $? -eq 0	# {
michael@34:  	  then
michael@34:  	    LSOF_CFGF="$LSOF_CFGF -maix64"
michael@464: @@ -759,7 +759,7 @@
michael@34:      fi	#}
michael@34:      LSOF_CFGF="$LSOF_CFGF -DAIXV=$LSOF_VERS"
michael@34:      LSOF_DIALECT_DIR=aix
michael@34: -    echo $LSOF_CC | grep gcc > /dev/null
michael@34: +    $LSOF_CC --version | grep GCC > /dev/null
michael@34:      if test $? -eq 0 	# {
michael@34:      then
michael@34:  
michael@464: @@ -2239,7 +2239,7 @@
michael@34:  	fi	# }
michael@34:        fi	# }
michael@34:      fi	# }
michael@34: -    echo $LSOF_CC | grep gcc > /dev/null
michael@34: +    $LSOF_CC --version | grep GCC > /dev/null
michael@34:      if test $? -eq 0	# {
michael@34:      then
michael@34:        LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
michael@464: @@ -2293,7 +2293,7 @@
michael@34:        then
michael@34:  	LSOF_CFGF="$LSOF_CFGF -Ae +DD32"
michael@34:        else
michael@34: -	echo $LSOF_CC | grep -q gcc
michael@34: +	$LSOF_CC --version | grep -q GCC
michael@34:  	if test $? -ne 0	# {
michael@34:  	then
michael@34:  	  LSOF_CFGF="$LSOF_CFGF +DD32"
michael@464: @@ -2377,7 +2377,7 @@
michael@34:  	    echo "* NOTICE!  Configuring for 64 bit HP-UX *"
michael@34:  	    echo "*                                       *"
michael@34:  	    echo "*****************************************"
michael@34: -	    echo $LSOF_CC | grep gcc > /dev/null
michael@34: +	    $LSOF_CC --version | grep GCC > /dev/null
michael@34:  	    if test $? -eq 0	# {
michael@34:  	    then
michael@34:  
michael@464: @@ -2446,7 +2446,7 @@
michael@34:  	  else
michael@34:  	    LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64"
michael@34:  	    LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX"
michael@34: -	    echo $LSOF_CC | grep gcc > /dev/null
michael@34: +	    $LSOF_CC --version | grep GCC > /dev/null
michael@34:  	    if test $? -ne 0	# {
michael@34:  	    then
michael@34:  	      LSOF_CFGF="$LSOF_CFGF +DAportable"
michael@464: @@ -3655,7 +3655,7 @@
michael@34:  	LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
michael@34:        fi	# }
michael@34:      fi	# }
michael@34: -    echo $LSOF_CC | grep gcc > /dev/null
michael@34: +    $LSOF_CC --version | grep GCC > /dev/null
michael@34:      if test $? -eq 0	# {
michael@34:      then
michael@464:        LSOF_CFGL="$LSOF_CFGL -w"
michael@464: @@ -4300,6 +4300,9 @@
michael@34:  	LSOF_TSTBIGF=" "
michael@34:  	LSOF_TSTLFLG="-lsocket -lnsl"
michael@34:  	LSOF_VERS="100000"
michael@34: + 	if [ ".`isainfo -k`" = .amd64 ]; then
michael@34: + 	    LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil"
michael@34: + 	fi
michael@34:  	;;
michael@464:        5.11*)
michael@464:  	LSOF_TSTBIGF=" "
michael@464: @@ -4391,7 +4394,7 @@
michael@34:  	echo "main(){" >> ${LSOF_TMPC}.c
michael@34:  	echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c
michael@34:  	echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC"
michael@34: -	echo $LSOF_CC | grep gcc > /dev/null
michael@34: +	$LSOF_CC --version | grep GCC > /dev/null
michael@34:  	if test $? -eq 0	# {
michael@34:  	then
michael@34:  	  $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x  > /dev/null 2>&1
michael@464: @@ -4416,7 +4419,7 @@
michael@34:  	echo "main(){" >> ${LSOF_TMPC}.c
michael@34:  	echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c
michael@34:  	echo "Testing prdata.h for PR_LDT, using $LSOF_CC"
michael@34: -	echo $LSOF_CC | grep gcc > /dev/null
michael@34: +	$LSOF_CC --version | grep GCC > /dev/null
michael@34:  	if test $? -eq 0	# {
michael@34:  	then
michael@34:  	  $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
michael@464: @@ -4450,7 +4453,7 @@
michael@34:  	echo $SOLARIS_KERNBITS | grep 64 > /dev/null
michael@34:  	if test $? -eq 0	# {
michael@34:  	then
michael@34: -	  echo $LSOF_CC | grep gcc > /dev/null
michael@34: +	  $LSOF_CC --version | grep GCC > /dev/null
michael@34:  	  if test $? -eq 0	# {
michael@34:  	  then
michael@34:  
michael@464: @@ -4669,7 +4672,7 @@
michael@464:        then
michael@464:  	LSOF_CTFH=1
michael@464:        fi	# }
michael@34: -      if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h	# {
michael@34: +      if false	# {
michael@34:        then
michael@464:  	if test $LSOF_CTFH -eq 1	# {
michael@464:  	then
michael@464: @@ -4729,7 +4732,7 @@
michael@34:        echo "main(){" >> ${LSOF_TMPC}.c
michael@34:        echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c
michael@34:        echo "Testing vnode.h for VSOCK, using $LSOF_CC"
michael@34: -      echo $LSOF_CC | grep gcc > /dev/null
michael@34: +      $LSOF_CC --version | grep GCC > /dev/null
michael@34:        if test $? -eq 0	# {
michael@34:        then
michael@34:  	$LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
michael@464: @@ -5418,7 +5421,7 @@
michael@34:      echo "$i" >> $LSOF_TSTCFLG
michael@34:    done	# }
michael@34:  fi	# }
michael@34: -echo $LSOF_CC | grep gcc > /dev/null 2>&1
michael@34: +$LSOF_CC --version | grep GCC > /dev/null 2>&1
michael@34:  if test $? -eq 0	# {
michael@34:  then
michael@34:    echo "-DLT_GCC" >> $LSOF_TSTCFLG
michael@125: Index: dialects/freebsd/machine.h
michael@464: --- dialects/freebsd/machine.h.orig	2008-10-21 18:16:15 +0200
michael@464: +++ dialects/freebsd/machine.h	2010-01-19 19:16:39 +0100
michael@125: @@ -441,6 +441,11 @@
michael@125:   */
michael@125:  
michael@125:  /* #define	HASSECURITY	1 */
michael@125: +#if    FREEBSDV>=6000
michael@125: +#define        HASSECURITY     1
michael@125: +#define        HAS_SI_PRIV     1
michael@125: +#endif /* FREEBSDV>=6000 */
michael@125: +
michael@125:  
michael@125:  
michael@125:  /*
michael@464: Index: dialects/sun/machine.h
michael@464: --- dialects/sun/machine.h.orig	2009-03-25 20:22:23 +0100
michael@464: +++ dialects/sun/machine.h	2010-01-19 19:16:39 +0100
michael@464: @@ -84,6 +84,7 @@
michael@464:  #include <sys/poll.h>
michael@36:  
michael@464:  # if	solaris>=80000
michael@464: +#include <sys/types32.h>
michael@464:  #include <sys/wait.h>
michael@464:  #include <sys/types32.h>
michael@464:  #define	_KERNEL	1