From 15c9e3ee7f155a91e134f7307de0edb637f07d79 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Sat, 14 Oct 2006 11:13:59 +0000 Subject: [PATCH] fix building under Solaris 10/amd64 with a cruel hack --- lsof/lsof.patch | 26 ++++++++++++++++++-------- lsof/lsof.spec | 2 +- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/lsof/lsof.patch b/lsof/lsof.patch index 12e07f6ec3..2dae64f341 100644 --- a/lsof/lsof.patch +++ b/lsof/lsof.patch @@ -1,6 +1,6 @@ Index: Configure --- Configure.orig 2006-04-10 14:44:22.000000000 +0200 -+++ Configure 2006-10-12 20:02:32.759096443 +0200 ++++ Configure 2006-10-14 13:09:51.728206602 +0200 @@ -395,7 +395,7 @@ fi # } fi # } @@ -82,7 +82,17 @@ Index: Configure if test $? -eq 0 # { then LSOF_CFGL="-w" -@@ -3959,7 +3959,7 @@ +@@ -3881,6 +3881,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 + ;; + *) + echo Unknown Solaris version: $LSOF_VSTR +@@ -3959,7 +3962,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" @@ -91,7 +101,7 @@ Index: Configure if test $? -eq 0 # { then $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 -@@ -3984,7 +3984,7 @@ +@@ -3984,7 +3987,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" @@ -100,7 +110,7 @@ Index: Configure if test $? -eq 0 # { then $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 -@@ -4014,7 +4014,7 @@ +@@ -4014,7 +4017,7 @@ echo $SOLARIS_KERNBITS | grep 64 > /dev/null if test $? -eq 0 # { then @@ -109,7 +119,7 @@ Index: Configure if test $? -eq 0 # { then -@@ -4240,7 +4240,7 @@ +@@ -4240,7 +4243,7 @@ echo "main(){" >> ${LSOF_TMPC}.c echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c echo "Testing vnode.h for VSOCK, using $LSOF_CC" @@ -118,7 +128,7 @@ Index: Configure if test $? -eq 0 # { then $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 -@@ -4838,7 +4838,7 @@ +@@ -4838,7 +4841,7 @@ echo "$i" >> $LSOF_TSTCFLG done # } fi # } @@ -129,7 +139,7 @@ Index: Configure echo "-DLT_GCC" >> $LSOF_TSTCFLG Index: dialects/freebsd/machine.h --- dialects/freebsd/machine.h.orig 2006-03-28 01:29:14.000000000 +0200 -+++ dialects/freebsd/machine.h 2006-10-12 19:57:28.990204140 +0200 ++++ dialects/freebsd/machine.h 2006-10-14 13:09:30.370471813 +0200 @@ -436,6 +436,11 @@ */ @@ -144,7 +154,7 @@ Index: dialects/freebsd/machine.h /* Index: dialects/sun/machine.h --- dialects/sun/machine.h.orig 2006-03-28 00:57:40.000000000 +0200 -+++ dialects/sun/machine.h 2006-10-12 19:57:28.990497233 +0200 ++++ dialects/sun/machine.h 2006-10-14 13:09:30.370780612 +0200 @@ -75,6 +75,7 @@ #include diff --git a/lsof/lsof.spec b/lsof/lsof.spec index 727b6b6f35..5daa25a80f 100644 --- a/lsof/lsof.spec +++ b/lsof/lsof.spec @@ -33,7 +33,7 @@ Class: BASE Group: Debugging License: BSD Version: 4.77 -Release: 20061013 +Release: 20061014 # list of sources Source0: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_%{version}.tar.gz