components/coreutils/patches/coreutils-8_5.patch
author Norm Jacobs <Norm.Jacobs@Oracle.COM>
Tue, 01 Mar 2011 14:19:15 -0800
changeset 115 c360825c3a3f
parent 100 components/coreutils/coreutils-8_5.patch@385905d9554d
permissions -rw-r--r--
7022166 userland patches should move to subdirs
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
100
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
     1
--- coreutils-8.5/configure_orig	2011-02-08 16:13:56.850317000 -0800
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
     2
+++ coreutils-8.5/configure	2011-02-08 16:14:04.872411000 -0800
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
     3
@@ -53254,11 +53254,10 @@
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
     4
     optional_bin_progs="$optional_bin_progs df"
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
     5
   fi
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
     6
 }
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
     7
 fi
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
     8
 
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
     9
-# Limit stdbuf to ELF systems with GCC
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    10
 optional_pkglib_progs=
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    11
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether this is an ELF system" >&5
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    12
 $as_echo_n "checking whether this is an ELF system... " >&6; }
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    13
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    14
 /* end confdefs.h.  */
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    15
@@ -53274,28 +53273,24 @@
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    16
 fi
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    17
 rm -f conftest*
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    18
 
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    19
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $elf_sys" >&5
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    20
 $as_echo "$elf_sys" >&6; }
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    21
-if test "$elf_sys" = "yes" && \
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    22
-   test "$GCC" = "yes"; then
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    23
-  {
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    24
-  if test -z "$optional_bin_progs"; then
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    25
-    optional_bin_progs=stdbuf
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    26
-  else
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    27
-    optional_bin_progs="$optional_bin_progs stdbuf"
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    28
-  fi
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    29
-}
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    30
-  {
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    31
-  if test -z "$optional_pkglib_progs"; then
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    32
-    optional_pkglib_progs=libstdbuf.so
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    33
-  else
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    34
-    optional_pkglib_progs="$optional_pkglib_progs libstdbuf.so"
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    35
-  fi
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    36
-}
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    37
+
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    38
+if test -z "$optional_bin_progs"; then
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    39
+  optional_bin_progs=stdbuf
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    40
+else
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    41
+  optional_bin_progs="$optional_bin_progs stdbuf"
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    42
 fi
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    43
 
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    44
+if test -z "$optional_pkglib_progs"; then
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    45
+  optional_pkglib_progs=libstdbuf.so
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    46
+else
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    47
+  optional_pkglib_progs="$optional_pkglib_progs libstdbuf.so"
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    48
+fi
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    49
+
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    50
+
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    51
 ############################################################################
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    52
 mk="$srcdir/src/Makefile.am"
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    53
 # Extract all literal names from the definition of $(EXTRA_PROGRAMS)
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    54
 # in $mk but don't expand the variable references.
385905d9554d 7021215 migrate gnu-coreutils from sfw to userland gate
Craig Mohrman <Craig.Mohrman@oracle.com>
parents:
diff changeset
    55
 # Append each literal name to $optional_bin_progs.