michael@34: Index: Configure
michael@125: diff -Nau Configure.orig Configure
michael@125: --- Configure.orig	2009-03-25 20:24:01.000000000 +0100
michael@125: +++ Configure	2009-04-01 18:03:19.553379145 +0200
michael@36: @@ -417,7 +417,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@36: @@ -571,7 +571,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@36: @@ -609,7 +609,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@36: @@ -686,7 +686,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@36: @@ -733,7 +733,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@125: @@ -2193,7 +2193,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@125: @@ -2247,7 +2247,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@125: @@ -2331,7 +2331,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@125: @@ -2400,7 +2400,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@125: @@ -3609,7 +3609,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@34:        LSOF_CFGL="-w"
michael@125: @@ -4246,6 +4246,17 @@
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@36: +	;;
michael@36: +      5.11*)
michael@36: +	LSOF_TSTBIGF=" "
michael@36: +	LSOF_TSTLFLG="-lsocket -lnsl"
michael@36: +	LSOF_VERS="110000"
michael@36: + 	if [ ".`isainfo -k`" = .amd64 ]; then
michael@36: + 	    LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil"
michael@36: + 	fi
michael@34:  	;;
michael@34:        *)
michael@34:  	echo Unknown Solaris version: $LSOF_VSTR
michael@125: @@ -4323,7 +4334,7 @@
michael@36:        ;;
michael@36:      20500|20501)
michael@36:        ;;
michael@36: -    20600|70000|80000|90000|100000)
michael@36: +    20600|70000|80000|90000|100000|110000)
michael@36:        if test "X$SOLARIS_26PR_GWINDOWS" = "X"	# {
michael@36:        then
michael@36:  	rm -f ${LSOF_TMPC}.*
michael@125: @@ -4332,7 +4343,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@125: @@ -4357,7 +4368,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@125: @@ -4391,7 +4402,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@125: @@ -4597,7 +4608,7 @@
michael@34:  
michael@34:        # Check for Solaris 10 or higher ZFS.
michael@34:  
michael@34: -      if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h	# {
michael@34: +      if false	# {
michael@34:        then
michael@125:  
michael@125:        # Check for required ZFS kernel header files.
michael@125: @@ -4712,7 +4723,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@125: @@ -5398,7 +5409,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@125: diff -Nau dialects/freebsd/machine.h.orig dialects/freebsd/machine.h
michael@125: --- dialects/freebsd/machine.h.orig	2008-10-21 18:16:15.000000000 +0200
michael@125: +++ dialects/freebsd/machine.h	2009-04-01 18:07:54.041381807 +0200
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@36: Index: dialects/sun/dnode.c
michael@125: diff -Nau dialects/sun/dnode.c.orig dialects/sun/dnode.c
michael@125: --- dialects/sun/dnode.c.orig	2009-03-25 20:22:21.000000000 +0100
michael@125: +++ dialects/sun/dnode.c	2009-04-01 18:07:54.041381807 +0200
michael@125: @@ -92,6 +92,8 @@
michael@36:  #define	LOOKDEV_ALL	(LOOKDEV_TAB | LOOKDEV_CLONE | LOOKDEV_PSEUDO)
michael@36:  					/* look all places */
michael@36:  
michael@36: +#define NOOP ((void)0)
michael@36: +
michael@36:  
michael@36:  /*
michael@36:   * SAM-FS definitions
michael@125: @@ -2078,7 +2080,9 @@
michael@36:  	    if (kvs && kv.vfs_data
michael@36:  	    && !kread((KA_T)kv.vfs_data, (char *)&pcfs, sizeof(pcfs))) {
michael@36:  
michael@36: -#if	solaris>=70000
michael@36: +#if	solaris>=110000  /* pcfs_entps doesn't exist any more */
michael@36: +		NOOP;
michael@36: +#elif	solaris>=70000
michael@36:  		Lf->inode = (INODETYPE)pc_makenodeid(pc.pc_eblkno,
michael@36:  			    pc.pc_eoffset,
michael@36:  			    pc.pc_entry.pcd_attr,
michael@125: @@ -2092,7 +2096,7 @@
michael@36:  			    pc.pc_eoffset,
michael@36:  			    &pc.pc_entry,
michael@36:  			    pcfs.pcfs_entps);
michael@36: -#endif	/* solaris>=70000 */
michael@36: +#endif	/* solaris>=110000 */
michael@36:  
michael@36:  		Lf->inp_ty = 1;
michael@36:  	    }