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