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:   22-Feb-2006 18:45:23
  Branch: HEAD                             Handle: 2006022217452300

  Modified files:
    openpkg-src/lsof        lsof.patch lsof.spec

  Log:
    improve GCC detection. Submitted by: speedy at fozzie.ziew.org

  Summary:
    Revision    Changes     Path
    1.9         +129 -0     openpkg-src/lsof/lsof.patch
    1.59        +1  -1      openpkg-src/lsof/lsof.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/lsof/lsof.patch
  ============================================================================
  $ cvs diff -u -r1.8 -r1.9 lsof.patch
  --- openpkg-src/lsof/lsof.patch       10 Feb 2006 18:29:38 -0000      1.8
  +++ openpkg-src/lsof/lsof.patch       22 Feb 2006 17:45:23 -0000      1.9
  @@ -74,3 +74,132 @@
    
    
    /*
  +Index: lsof_4.76_src/Configure
  +--- lsof_4.76_src/Configure.orig     2005-08-29 12:17:38.000000000 +0200
  ++++ lsof_4.76_src/Configure  2005-12-30 18:38:58.000000000 +0100
  +@@ -396,7 +396,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
  + 
  +@@ -540,7 +540,7 @@
  +     LSOF_CFGF="$LSOF_CFGF -I`pwd`/dialects/aix/aix5"
  +     if test $LSOF_VERS -ge 5200     # {
  +     then
  +-      echo $LSOF_CC | grep gcc > /dev/null
  ++      $LSOF_CC --version | grep GCC > /dev/null
  +       if test $? -eq 0      # {
  +       then
  + 
  +@@ -578,7 +578,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
  + 
  +@@ -655,7 +655,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"
  +@@ -702,7 +702,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
  + 
  +@@ -1921,7 +1921,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'`
  +@@ -2045,7 +2045,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
  + 
  +@@ -2114,7 +2114,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"
  +@@ -3293,7 +3293,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="-w"
  +@@ -3975,7 +3975,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
  +@@ -4000,7 +4000,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
  +@@ -4030,7 +4030,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
  + 
  +@@ -4256,7 +4256,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
  +@@ -4854,7 +4854,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
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/lsof/lsof.spec
  ============================================================================
  $ cvs diff -u -r1.58 -r1.59 lsof.spec
  --- openpkg-src/lsof/lsof.spec        10 Feb 2006 18:29:38 -0000      1.58
  +++ openpkg-src/lsof/lsof.spec        22 Feb 2006 17:45:23 -0000      1.59
  @@ -33,7 +33,7 @@
   Group:        Filesystem
   License:      BSD
   Version:      4.76
  -Release:      20060210
  +Release:      20060222
   
   #   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                     [email protected]

Reply via email to