[oe-commits] org.oe.dev glibc* 2.4 add proper fix for building against recent linux userland headers

Fri Sep 29 10:25:50 UTC 2006

glibc* 2.4 add proper fix for building against recent linux userland headers
repairs breakage introduce by previous patches. thanks Jamie Lenehan.

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: c03b28dceb994cd2ab73b1d2bee782c3a0360eac
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c03b28dceb994cd2ab73b1d2bee782c3a0360eac
Files:
1
packages/glibc/glibc-2.4/fix-fchownat-20060808.patch
packages/glibc/glibc-2.4/openat-bugzilla-fix-1220.patch
packages/glibc/glibc-2.4/glibc-2.4-openat-3.patch
packages/glibc/glibc_2.4.bb
Diffs:

#
# mt diff -ra0515cfc57ad7f8bf480aeb5712b98852de50b3a -rc03b28dceb994cd2ab73b1d2bee782c3a0360eac
#
# 
# 
# delete "packages/glibc/glibc-2.4/fix-fchownat-20060808.patch"
# 
# delete "packages/glibc/glibc-2.4/openat-bugzilla-fix-1220.patch"
# 
# add_file "packages/glibc/glibc-2.4/glibc-2.4-openat-3.patch"
#  content [648cfc703dd806ecd5ca290da44fd9d20361ca19]
# 
# patch "packages/glibc/glibc_2.4.bb"
#  from [e35960439c0b38746f6a28684b8e949b3853a08b]
#    to [d54be1242a6d428747979e09f41f0c9344d1bbb3]
# 
============================================================

--- packages/glibc/glibc-2.4/glibc-2.4-openat-3.patch	648cfc703dd806ecd5ca290da44fd9d20361ca19
+++ packages/glibc/glibc-2.4/glibc-2.4-openat-3.patch	648cfc703dd806ecd5ca290da44fd9d20361ca19
@@ -0,0 +1,133 @@
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2006-08-18
+Initial Package Version: 2.4
+Origin: http://sourceware.org/bugzilla/show_bug.cgi?id=2873
+Upstream Status: Applied
+Description: Fixes http://sourceware.org/bugzilla/show_bug.cgi?id=2873
+	     http://sourceware.org/bugzilla/show_bug.cgi?id=3040
+             http://linuxfromscratch.org/pipermail/lfs-dev/2006-June/057562.html
+	     Updated by Joe Ciccone
+
+diff -Naur glibc-2.4.orig/sysdeps/unix/sysv/linux/i386/fchownat.c glibc-2.4/sysdeps/unix/sysv/linux/i386/fchownat.c
+--- glibc-2.4.orig/sysdeps/unix/sysv/linux/i386/fchownat.c	2006-02-23 14:50:21.000000000 -0800
++++ glibc-2.4/sysdeps/unix/sysv/linux/i386/fchownat.c	2006-08-18 20:38:21.773288795 -0700
+@@ -61,6 +61,24 @@
+ int
+ fchownat (int fd, const char *file, uid_t owner, gid_t group, int flag)
+ {
++  int result;
++
++#ifdef __NR_fchownat
++# ifndef __ASSUME_ATFCTS
++  if (__have_atfcts >= 0)
++# endif
++    {
++      result = INLINE_SYSCALL (fchownat, 5, fd, file, owner, group, flag);
++# ifndef __ASSUME_ATFCTS
++      if (result == -1 && errno == ENOSYS)
++	__have_atfcts = -1;
++      else
++# endif
++	return result;
++    }
++#endif
++
++#ifndef __ASSUME_ATFCTS
+   if (flag & ~AT_SYMLINK_NOFOLLOW)
+     {
+       __set_errno (EINVAL);
+@@ -87,14 +105,13 @@
+       file = buf;
+     }
+ 
+-  int result;
+   INTERNAL_SYSCALL_DECL (err);
+ 
+-#if defined __NR_lchown || __ASSUME_LCHOWN_SYSCALL > 0
+-# if __ASSUME_LCHOWN_SYSCALL == 0
++# if defined __NR_lchown || __ASSUME_LCHOWN_SYSCALL > 0
++#  if __ASSUME_LCHOWN_SYSCALL == 0
+   static int __libc_old_chown;
+ 
+-#  ifdef __NR_chown32
++#   ifdef __NR_chown32
+   if (__libc_missing_32bit_uids <= 0)
+     {
+       if (flag & AT_SYMLINK_NOFOLLOW)
+@@ -111,7 +128,7 @@
+ 
+       __libc_missing_32bit_uids = 1;
+     }
+-#  endif /* __NR_chown32 */
++#   endif /* __NR_chown32 */
+ 
+   if (((owner + 1) > (uid_t) ((__kernel_uid_t) -1U))
+       || ((group + 1) > (gid_t) ((__kernel_gid_t) -1U)))
+@@ -135,13 +152,13 @@
+ 
+   result = INTERNAL_SYSCALL (lchown, err, 3, CHECK_STRING (file), owner,
+ 			     group);
+-# elif __ASSUME_32BITUIDS
++#  elif __ASSUME_32BITUIDS
+   /* This implies __ASSUME_LCHOWN_SYSCALL.  */
+   result = INTERNAL_SYSCALL (chown32, err, 3, CHECK_STRING (file), owner,
+ 			     group);
+-# else
++#  else
+   /* !__ASSUME_32BITUIDS && ASSUME_LCHOWN_SYSCALL  */
+-#  ifdef __NR_chown32
++#   ifdef __NR_chown32
+   if (__libc_missing_32bit_uids <= 0)
+     {
+       result = INTERNAL_SYSCALL (chown32, err, 3, CHECK_STRING (file), owner,
+@@ -153,7 +170,7 @@
+ 
+       __libc_missing_32bit_uids = 1;
+     }
+-#  endif /* __NR_chown32 */
++#   endif /* __NR_chown32 */
+   if (((owner + 1) > (uid_t) ((__kernel_uid_t) -1U))
+       || ((group + 1) > (gid_t) ((__kernel_gid_t) -1U)))
+     {
+@@ -162,10 +179,10 @@
+     }
+ 
+   result = INTERNAL_SYSCALL (chown, err, 3, CHECK_STRING (file), owner, group);
+-# endif
+-#else
++#  endif
++# else
+   result = INTERNAL_SYSCALL (chown, err, 3, CHECK_STRING (file), owner, group);
+-#endif
++# endif
+ 
+   if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (result, err), 0))
+     goto fail;
+@@ -175,4 +192,5 @@
+  fail:
+   __atfct_seterrno (INTERNAL_SYSCALL_ERRNO (result, err), fd, buf);
+   return -1;
++#endif
+ }
+diff -Naur glibc-2.4.orig/sysdeps/unix/sysv/linux/openat.c glibc-2.4/sysdeps/unix/sysv/linux/openat.c
+--- glibc-2.4.orig/sysdeps/unix/sysv/linux/openat.c	2006-02-28 21:32:42.000000000 -0800
++++ glibc-2.4/sysdeps/unix/sysv/linux/openat.c	2006-08-18 20:39:14.360012706 -0700
+@@ -29,8 +29,6 @@
+ 
+ 
+ #if !defined OPENAT && !defined __ASSUME_ATFCTS
+-# define OPENAT openat
+-
+ /* Set errno after a failed call.  If BUF is not null,
+    it is a /proc/self/fd/ path name we just tried to use.  */
+ void
+@@ -63,6 +61,9 @@
+ int __have_atfcts;
+ #endif
+ 
++#ifndef OPENAT
++# define OPENAT openat
++#endif
+ 
+ #define OPENAT_NOT_CANCEL CONCAT (OPENAT)
+ #define CONCAT(name) CONCAT2 (name)
============================================================
--- packages/glibc/glibc_2.4.bb	e35960439c0b38746f6a28684b8e949b3853a08b
+++ packages/glibc/glibc_2.4.bb	d54be1242a6d428747979e09f41f0c9344d1bbb3
@@ -56,6 +56,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gli
            file://ldsocache-varrun.patch;patch=1 \
            file://nptl-crosscompile.patch;patch=1 \
 	   file://glibc-2.4-compile.patch;patch=1 \
+	   file://glibc-2.4-openat-3.patch;patch=1 \
 	   file://fixup-aeabi-syscalls.patch;patch=1 \
 	   file://zecke-sane-readelf.patch;patch=1 \
 	   file://generic-bits_select.h \
@@ -65,10 +66,6 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gli
            file://etc/ld.so.conf \
            file://generate-supported.mk"
 
-# Build fails of x86 without additional patches, but these break arm
-SRC_URI_append_x86 = " file://openat-bugzilla-fix-1220.patch;patch=1 \
-           file://fix-fchownat-20060808.patch;patch=1"
-
 # Build fails on sh3 and sh4 without additional patches
 SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
 SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"




