OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Oct-2006 13:13:59
Branch: HEAD Handle: 2006101412135900
Modified files:
openpkg-src/lsof lsof.patch lsof.spec
Log:
fix building under Solaris 10/amd64 with a cruel hack
Summary:
Revision Changes Path
1.12 +18 -8 openpkg-src/lsof/lsof.patch
1.65 +1 -1 openpkg-src/lsof/lsof.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/lsof/lsof.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 lsof.patch
--- openpkg-src/lsof/lsof.patch 12 Oct 2006 18:12:38 -0000 1.11
+++ openpkg-src/lsof/lsof.patch 14 Oct 2006 11:13:59 -0000 1.12
@@ -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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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/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 <sys/poll.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lsof/lsof.spec
============================================================================
$ cvs diff -u -r1.64 -r1.65 lsof.spec
--- openpkg-src/lsof/lsof.spec 13 Oct 2006 17:29:44 -0000 1.64
+++ openpkg-src/lsof/lsof.spec 14 Oct 2006 11:13:59 -0000 1.65
@@ -33,7 +33,7 @@
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
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
