coreutils-6.10.diff

   1 diff -uraN coreutils-6.10.orig/debian/patches/coreutils-6.10_80_kopensolaris-gnu coreutils-6.10/debian/patches/coreutils-6.10_80_kopensolaris-gnu
   2 --- coreutils-6.10.orig/debian/patches/coreutils-6.10_80_kopensolaris-gnu       1969-12-31 19:00:00.000000000 -0500
   3 +++ coreutils-6.10/debian/patches/coreutils-6.10_80_kopensolaris-gnu    2008-09-27 19:50:55.121283318 -0400
   4 @@ -0,0 +1,123 @@
   5 +diff -uraN coreutils-6.10.orig/build-aux/config.rpath coreutils-6.10/build-aux/config.rpath
   6 +--- coreutils-6.10.orig/build-aux/config.rpath 2008-01-09 02:39:14.000000000 -0500
   7 ++++ coreutils-6.10/build-aux/config.rpath      2008-09-25 18:44:18.995409593 -0400
   8 +@@ -74,7 +74,7 @@
   9 +       ;;
  10 +     newsos6)
  11 +       ;;
  12 +-    linux* | k*bsd*-gnu)
  13 ++    linux* | k*bsd*-gnu | kopensolaris*gnu)
  14 +       case $cc_basename in
  15 +         icc* | ecc*)
  16 +           wl='-Wl,'
  17 +@@ -196,7 +196,7 @@
  18 +       hardcode_direct=no
  19 +       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  20 +       ;;
  21 +-    gnu* | linux* | k*bsd*-gnu)
  22 ++    gnu* | linux* | k*bsd*-gnu | kopensolaris*gnu)
  23 +       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  24 +         :
  25 +       else
  26 +@@ -576,7 +576,7 @@
  27 +     ;;
  28 +   linux*oldld* | linux*aout* | linux*coff*)
  29 +     ;;
  30 +-  linux* | k*bsd*-gnu)
  31 ++  linux* | k*bsd*-gnu | kopensolaris*gnu)
  32 +     library_names_spec='$libname$shrext'
  33 +     ;;
  34 +   knetbsd*-gnu)
  35 +diff -uraN coreutils-6.10.orig/configure coreutils-6.10/configure
  36 +--- coreutils-6.10.orig/configure      2008-01-21 18:32:22.000000000 -0500
  37 ++++ coreutils-6.10/configure   2008-09-25 18:44:19.009873032 -0400
  38 +@@ -12177,7 +12177,7 @@
  39 +                 if test "X$additional_includedir" = "X/usr/local/include"; then
  40 +                   if test -n "$GCC"; then
  41 +                     case $host_os in
  42 +-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
  43 ++                      linux* | gnu* | k*bsd*-gnu | kopensolaris*gnu) haveit=yes;;
  44 +                     esac
  45 +                   fi
  46 +                 fi
  47 +@@ -12221,7 +12221,7 @@
  48 +                       if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
  49 +                         if test -n "$GCC"; then
  50 +                           case $host_os in
  51 +-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
  52 ++                            linux* | gnu* | k*bsd*-gnu | kopensolaris*gnu) haveit=yes;;
  53 +                           esac
  54 +                         fi
  55 +                       fi
  56 +@@ -24549,7 +24549,7 @@
  57 + cat >>conftest.$ac_ext <<_ACEOF
  58 + /* end confdefs.h.  */
  59 + #include <sys/types.h>
  60 +-#if defined __GLIBC__ && !defined __BEOS__
  61 ++#if defined __GLIBC__ && !defined __BEOS__ && !defined __OpenSolaris_kernel__
  62 + Do not use statvfs on systems with GNU libc, because that function stats
  63 + all preceding entries in /proc/mounts, and that makes df hang if even
  64 + one of the corresponding file systems is hard-mounted, but not available.
  65 +@@ -69156,7 +69156,7 @@
  66 +                 if test "X$additional_includedir" = "X/usr/local/include"; then
  67 +                   if test -n "$GCC"; then
  68 +                     case $host_os in
  69 +-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
  70 ++                      linux* | gnu* | k*bsd*-gnu | kopensolaris*gnu) haveit=yes;;
  71 +                     esac
  72 +                   fi
  73 +                 fi
  74 +@@ -69200,7 +69200,7 @@
  75 +                       if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
  76 +                         if test -n "$GCC"; then
  77 +                           case $host_os in
  78 +-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
  79 ++                            linux* | gnu* | k*bsd*-gnu | kopensolaris*gnu) haveit=yes;;
  80 +                           esac
  81 +                         fi
  82 +                       fi
  83 +diff -uraN coreutils-6.10.orig/m4/fsusage.m4 coreutils-6.10/m4/fsusage.m4
  84 +--- coreutils-6.10.orig/m4/fsusage.m4  2007-08-28 03:58:10.000000000 -0400
  85 ++++ coreutils-6.10/m4/fsusage.m4       2008-09-25 18:44:19.011562682 -0400
  86 +@@ -47,7 +47,7 @@
  87 +   # SVR4
  88 +   AC_CACHE_CHECK([for statvfs function (SVR4)], fu_cv_sys_stat_statvfs,
  89 +                [AC_TRY_LINK([#include <sys/types.h>
  90 +-#if defined __GLIBC__ && !defined __BEOS__
  91 ++#if defined __GLIBC__ && !defined __BEOS__ && !defined __OpenSolaris_kernel__
  92 + Do not use statvfs on systems with GNU libc, because that function stats
  93 + all preceding entries in /proc/mounts, and that makes df hang if even
  94 + one of the corresponding file systems is hard-mounted, but not available.
  95 +diff -uraN coreutils-6.10.orig/m4/lib-link.m4 coreutils-6.10/m4/lib-link.m4
  96 +--- coreutils-6.10.orig/m4/lib-link.m4 2007-11-08 02:32:20.000000000 -0500
  97 ++++ coreutils-6.10/m4/lib-link.m4      2008-09-25 18:44:19.012055925 -0400
  98 +@@ -432,7 +432,7 @@
  99 +                 if test "X$additional_includedir" = "X/usr/local/include"; then
 100 +                   if test -n "$GCC"; then
 101 +                     case $host_os in
 102 +-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
 103 ++                      linux* | gnu* | k*bsd*-gnu | kopensolaris*gnu) haveit=yes;;
 104 +                     esac
 105 +                   fi
 106 +                 fi
 107 +@@ -481,7 +481,7 @@
 108 +                       if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
 109 +                         if test -n "$GCC"; then
 110 +                           case $host_os in
 111 +-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
 112 ++                            linux* | gnu* | k*bsd*-gnu | kopensolaris*gnu) haveit=yes;;
 113 +                           esac
 114 +                         fi
 115 +                       fi
 116 +diff -uraN coreutils-6.10.orig/m4/lib-prefix.m4 coreutils-6.10/m4/lib-prefix.m4
 117 +--- coreutils-6.10.orig/m4/lib-prefix.m4       2007-08-28 03:58:10.000000000 -0400
 118 ++++ coreutils-6.10/m4/lib-prefix.m4    2008-09-25 18:44:19.012372956 -0400
 119 +@@ -70,7 +70,7 @@
 120 +         if test "X$additional_includedir" = "X/usr/local/include"; then
 121 +           if test -n "$GCC"; then
 122 +             case $host_os in
 123 +-              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
 124 ++              linux* | gnu* | k*bsd*-gnu | kopensolaris*gnu) haveit=yes;;
 125 +             esac
 126 +           fi
 127 +         fi