[oe-commits] org.oe.dev coreutils: Add workaround to allow -native version to work with Ubuntu Edgy headers (from poky)

[rpurdie commit]

coreutils: Add workaround to allow -native version to work with Ubuntu Edgy headers (from poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: c9d73a1c21bb74f445d189d5f5bfb4f32a280e63
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c9d73a1c21bb74f445d189d5f5bfb4f32a280e63
Files:
1
packages/coreutils/coreutils-5.1.3/rename-eaccess.patch
packages/coreutils/coreutils_5.1.3.bb
Diffs:

#
# mt diff -r8249ccff2e06c56616160267bbf60440130edfaf -rc9d73a1c21bb74f445d189d5f5bfb4f32a280e63
#
# 
# 
# add_file "packages/coreutils/coreutils-5.1.3/rename-eaccess.patch"
#  content [b320d731773b96e184ef360ceab8f4fcbddf1554]
# 
# patch "packages/coreutils/coreutils_5.1.3.bb"
#  from [4d40101d7d1f8397da2f653507eecbdad60402a1]
#    to [d81babb35d7ef8dd5dd850355330071afeaad51d]
# 
============================================================
--- packages/coreutils/coreutils-5.1.3/rename-eaccess.patch	b320d731773b96e184ef360ceab8f4fcbddf1554
+++ packages/coreutils/coreutils-5.1.3/rename-eaccess.patch	b320d731773b96e184ef360ceab8f4fcbddf1554
@@ -0,0 +1,44 @@
+# On Ubuntu edgy (and perhaps other distributions), eaccess is provided by
+# unistd.h - This renames the function so as not to conflict.
+
+--- coreutils-5.1.3/src/test.c.old	2006-08-17 15:29:41.000000000 +0100
++++ coreutils-5.1.3/src/test.c	2006-08-17 15:30:44.000000000 +0100
+@@ -125,7 +125,7 @@
+ /* Do the same thing access(2) does, but use the effective uid and gid.  */
+ 
+ static int
+-eaccess (char const *file, int mode)
++_eaccess (char const *file, int mode)
+ {
+   static int have_ids;
+   static uid_t uid, euid;
+@@ -158,7 +158,7 @@
+   return result;
+ }
+ #else
+-# define eaccess(F, M) euidaccess (F, M)
++# define _eaccess(F, M) euidaccess (F, M)
+ #endif
+ 
+ /* Increment our position in the argument list.  Check that we're not
+@@ -623,17 +623,17 @@
+ 
+     case 'r':			/* file is readable? */
+       unary_advance ();
+-      value = -1 != eaccess (argv[pos - 1], R_OK);
++      value = -1 != _eaccess (argv[pos - 1], R_OK);
+       return (TRUE == value);
+ 
+     case 'w':			/* File is writable? */
+       unary_advance ();
+-      value = -1 != eaccess (argv[pos - 1], W_OK);
++      value = -1 != _eaccess (argv[pos - 1], W_OK);
+       return (TRUE == value);
+ 
+     case 'x':			/* File is executable? */
+       unary_advance ();
+-      value = -1 != eaccess (argv[pos - 1], X_OK);
++      value = -1 != _eaccess (argv[pos - 1], X_OK);
+       return (TRUE == value);
+ 
+     case 'O':			/* File is owned by you? */
============================================================
--- packages/coreutils/coreutils_5.1.3.bb	4d40101d7d1f8397da2f653507eecbdad60402a1
+++ packages/coreutils/coreutils_5.1.3.bb	d81babb35d7ef8dd5dd850355330071afeaad51d
@@ -1,13 +1,14 @@ RPROVIDES = "textutils shellutils fileut
 LICENSE = "GPL"
 SECTION = "base"
 DESCRIPTION = "A collection of core GNU utilities."
 RREPLACES = "textutils shellutils fileutils"
 RPROVIDES = "textutils shellutils fileutils"
-PR = "r7"
+PR = "r8"
 
 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-eaccess.patch;patch=1"
 
 inherit autotools