pkgs/tools/package-management/checkinstall/glibc-check.patch

   1 diff -x '*~' -rc checkinstall-1.6.2pre20081116-orig/installwatch/create-localdecls checkinstall-1.6.2pre20081116/installwatch/create-localdecls
   2 *** checkinstall-1.6.2pre20081116-orig/installwatch/create-localdecls   2008-11-16 17:18:58.000000000 +0100
   3 --- checkinstall-1.6.2pre20081116/installwatch/create-localdecls        2009-09-18 17:01:13.000000000 +0200
   4 ***************
   5 *** 46,52 ****
   6   echo -n 'Checking libc version... '
   7   gcc -Wall -o libctest libctest.c
   8   VERSION=`ldd libctest | grep libc\\.so | awk '{print $1}'`
   9 - rm libctest
  10   echo $VERSION
  11   echo "#define LIBC_VERSION \"$VERSION\"" >> $OUTFILE
  12   if test "$VERSION" = 'libc.so.5' ; then
  13 --- 46,51 ----
  14 ***************
  15 *** 56,62 ****
  16
  17   if test "$VERSION" = 'libc.so.6' ; then
  18         echo -n 'Checking glibc subversion... '
  19 !       tmp="`ldd /bin/sh | grep libc.so 2> /dev/null`"
  20         LibcPath=`expr "$tmp" : '[^/]*\(/[^ ]*\)'`
  21         tmp="`strings $LibcPath | grep -i 'c library'`"
  22         OsLibcMajor=`expr "$tmp" : '.* \([0-9][0-9]*\)'`
  23 --- 55,61 ----
  24
  25   if test "$VERSION" = 'libc.so.6' ; then
  26         echo -n 'Checking glibc subversion... '
  27 !       tmp="`ldd libctest | grep libc.so 2> /dev/null`"
  28         LibcPath=`expr "$tmp" : '[^/]*\(/[^ ]*\)'`
  29         tmp="`strings $LibcPath | grep -i 'c library'`"
  30         OsLibcMajor=`expr "$tmp" : '.* \([0-9][0-9]*\)'`
  31 ***************
  32 *** 86,103 ****
  33                 6)
  34                         echo '#define GLIBC_MINOR 6' >> $OUTFILE
  35                         SUBVERSION='glibc-2.6' ;;
  36 !               7)
  37                         echo '#define GLIBC_MINOR 7' >> $OUTFILE
  38                         SUBVERSION='glibc-2.7' ;;
  39                 *)
  40 -                       echo 'Treated as glibc >= 2.1 (finger crossed)'
  41                         echo '#define GLIBC_MINOR 1' >> $OUTFILE
  42                         SUBVERSION='glibc-2.1' ;;
  43                 esac
  44                 ;;
  45         esac
  46   fi
  47
  48   echo >> $OUTFILE
  49   echo '#endif' >> $OUTFILE
  50
  51 --- 85,104 ----
  52                 6)
  53                         echo '#define GLIBC_MINOR 6' >> $OUTFILE
  54                         SUBVERSION='glibc-2.6' ;;
  55 !               7|8|9|10|11|12|13|14|15|16|17|18)
  56                         echo '#define GLIBC_MINOR 7' >> $OUTFILE
  57                         SUBVERSION='glibc-2.7' ;;
  58                 *)
  59                         echo '#define GLIBC_MINOR 1' >> $OUTFILE
  60                         SUBVERSION='glibc-2.1' ;;
  61                 esac
  62                 ;;
  63         esac
  64 +         echo $SUBVERSION
  65   fi
  66
  67 + rm libctest
  68 +
  69   echo >> $OUTFILE
  70   echo '#endif' >> $OUTFILE
  71