[oe-commits] org.oe.dev coreutils 5.3: Fix for glibc 2.5 by renaming the tee function to tee_files

[lenehan commit]

coreutils 5.3: Fix for glibc 2.5 by renaming the tee function to tee_files
to prevent a conflict with the tee function definied by glibc 2.5 The name
tee_files is what is used in newer coreutils distriubtions. See bug #1483.

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: b20a6d62c2d08e59c4500c446161fe8699f85423
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b20a6d62c2d08e59c4500c446161fe8699f85423
Files:
1
packages/coreutils/coreutils-5.3.0/rename-tee-for-glibc2.5.patch
packages/coreutils/coreutils_5.3.0.bb
Diffs:

#
# mt diff -rd7f05876eacb837d8e692f9d0e2e23b89792e34f -rb20a6d62c2d08e59c4500c446161fe8699f85423
#
# 
# 
# add_file "packages/coreutils/coreutils-5.3.0/rename-tee-for-glibc2.5.patch"
#  content [295474bdf81629c67d4bfe9f144ffd637c886e56]
# 
# patch "packages/coreutils/coreutils_5.3.0.bb"
#  from [9d106dd5c37bfbc20c5f089f3c5dde32be3a3485]
#    to [bab2ee417a7e914e5c12c52cb379a3ef8cddf4a7]
# 
============================================================
--- packages/coreutils/coreutils-5.3.0/rename-tee-for-glibc2.5.patch	295474bdf81629c67d4bfe9f144ffd637c886e56
+++ packages/coreutils/coreutils-5.3.0/rename-tee-for-glibc2.5.patch	295474bdf81629c67d4bfe9f144ffd637c886e56
@@ -0,0 +1,33 @@
+Glibc 2.5 has a function called tee which conflicts with the same function
+in coreutils. This patch renames the function to tee_files (as is done in
+the newer coreutils versions.)
+
+--- coreutils-5.3.0/src/tee.c	2006/10/23 07:35:00	1.1
++++ coreutils-5.3.0/src/tee.c	2006/10/23 07:35:16
+@@ -31,7 +31,7 @@
+ 
+ #define AUTHORS "Mike Parker", "Richard M. Stallman", "David MacKenzie"
+ 
+-static bool tee (int nfiles, const char **files);
++static bool tee_files (int nfiles, const char **files);
+ 
+ /* If true, append to output files rather than truncating them. */
+ static bool append;
+@@ -121,7 +121,7 @@
+   /* Do *not* warn if tee is given no file arguments.
+      POSIX requires that it work when given no arguments.  */
+ 
+-  ok = tee (argc - optind, (const char **) &argv[optind]);
++  ok = tee_files (argc - optind, (const char **) &argv[optind]);
+   if (close (STDIN_FILENO) != 0)
+     error (EXIT_FAILURE, errno, _("standard input"));
+ 
+@@ -133,7 +133,7 @@
+    Return true if successful.  */
+ 
+ static bool
+-tee (int nfiles, const char **files)
++tee_files (int nfiles, const char **files)
+ {
+   FILE **descriptors;
+   char buffer[BUFSIZ];
============================================================
--- packages/coreutils/coreutils_5.3.0.bb	9d106dd5c37bfbc20c5f089f3c5dde32be3a3485
+++ packages/coreutils/coreutils_5.3.0.bb	bab2ee417a7e914e5c12c52cb379a3ef8cddf4a7
@@ -1,13 +1,14 @@ RPROVIDES = "textutils shellutils fileut
 DESCRIPTION = "A collection of core GNU utilities."
 LICENSE = "GPL"
 SECTION = "base"
 RREPLACES = "textutils shellutils fileutils"
 RPROVIDES = "textutils shellutils fileutils"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
            file://install-cross.patch;patch=1;pnum=0 \
-           file://man.patch;patch=1"
+           file://man.patch;patch=1 \
+           file://rename-tee-for-glibc2.5.patch;patch=1"
 
 SRC_URI += "file://uptime-pow-lib.patch;patch=1"