r1676 - in glibc-package: branches/glibc-2.4/debian branches/glibc-2.4/debian/patches branches/glibc-2.4/debian/patches/powerpc trunk/debian trunk/debian/patches trunk/debian/patches/powerpc
Author: aurel32
Date: 2006-07-25 00:12:28 +0000 (Tue, 25 Jul 2006)
New Revision: 1676
Added:
glibc-package/branches/glibc-2.4/debian/patches/powerpc/cvs-procfs.diff
glibc-package/trunk/debian/patches/powerpc/cvs-procfs.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/series
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/powerpc/cvs-procfs.diff: patch from upstream (fix a build failure
with recent kernel headers). (Closes: #377892)
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-07-19 21:55:10 UTC (rev 1675)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-07-25 00:12:28 UTC (rev 1676)
@@ -162,6 +162,8 @@
option. (Closes: #375741)
* debian/local/manpages/iconv.1: fixed the use of the TH keyword. (Closes:
#372510)
+ * debian/locales-all.README.Debian: File removed, it is useless now.
+ (Closes: #378191)
[ Denis Barbier ]
* debian/control.in/main: also make locales Conflicts: belocs-locales-bin.
Added: glibc-package/branches/glibc-2.4/debian/patches/powerpc/cvs-procfs.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/powerpc/cvs-procfs.diff 2006-07-19 21:55:10 UTC (rev 1675)
+++ glibc-package/branches/glibc-2.4/debian/patches/powerpc/cvs-procfs.diff 2006-07-25 00:12:28 UTC (rev 1676)
@@ -0,0 +1,21 @@
+2006-04-03 Andreas Schwab <schwab@suse.de>
+
+ * sysdeps/unix/sysv/linux/powerpc/sys/procfs.h: Test for <asm/elf.h>
+ with [! _ASM_POWERPC_ELF_H] as well as [!__PPC64_ELF_H].
+
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h,v
+retrieving revision 1.13
+retrieving revision 1.14
+diff -u -r1.13 -r1.14
+--- libc/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h 2006/01/13 07:58:57 1.13
++++ libc/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h 2006/04/04 06:58:58 1.14
+@@ -35,7 +35,7 @@
+ /* These definitions are normally provided by ucontext.h via
+ asm/sigcontext.h, asm/ptrace.h, and asm/elf.h. Otherwise we define
+ them here. */
+-#ifndef __PPC64_ELF_H
++#if !defined __PPC64_ELF_H && !defined _ASM_POWERPC_ELF_H
+ #define ELF_NGREG 48 /* includes nip, msr, lr, etc. */
+ #define ELF_NFPREG 33 /* includes fpscr */
+ #if __WORDSIZE == 32
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-07-19 21:55:10 UTC (rev 1675)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-07-25 00:12:28 UTC (rev 1676)
@@ -89,6 +89,7 @@
mips/local-lazy-eval.diff -p2
mips/submitted-msq.diff -p0
+powerpc/cvs-procfs.diff -i1
powerpc/local-sysconf.diff -p1
sparc/local-fork.diff -p0
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-07-19 21:55:10 UTC (rev 1675)
+++ glibc-package/trunk/debian/changelog 2006-07-25 00:12:28 UTC (rev 1676)
@@ -7,7 +7,7 @@
upstream.
* Build with gcc 4.1 on all architectures but hurd-i386.
* debian/sysdeps/s390.mk: switch s390x to nptl.
- * debian/rules.d/build.mk: use ld.so libc.so instead of libc.so to
+ * debian/rules.d/build.mk: use ld.so libc.so instead of libc.so to
determine if the host CPU is able to run the testsuite.
* debian/sysdeps/kfreebsd.mk: also use the nfs/ directory from kernel
headers.
@@ -16,6 +16,8 @@
option. (Closes: #375741)
* debian/local/manpages/iconv.1: fixed the use of the TH keyword. (Closes:
#372510)
+ * patches/powerpc/cvs-procfs.diff: patch from upstream (fix a build failure
+ with recent kernel headers). (Closes: #377892)
[ Denis Barbier ]
* debian/main/control.in: also make locales Conflicts: belocs-locales-bin.
@@ -40,7 +42,7 @@
* debian/locales-all.README.Debian: File removed, it is useless now.
(Closes: #378191)
- -- Aurelien Jarno <aurel32@debian.org> Thu, 8 Jun 2006 08:03:49 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 25 Jul 2006 02:05:04 +0200
glibc (2.3.6-15) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/powerpc/cvs-procfs.diff
===================================================================
--- glibc-package/trunk/debian/patches/powerpc/cvs-procfs.diff 2006-07-19 21:55:10 UTC (rev 1675)
+++ glibc-package/trunk/debian/patches/powerpc/cvs-procfs.diff 2006-07-25 00:12:28 UTC (rev 1676)
@@ -0,0 +1,21 @@
+2006-04-03 Andreas Schwab <schwab@suse.de>
+
+ * sysdeps/unix/sysv/linux/powerpc/sys/procfs.h: Test for <asm/elf.h>
+ with [! _ASM_POWERPC_ELF_H] as well as [!__PPC64_ELF_H].
+
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h,v
+retrieving revision 1.13
+retrieving revision 1.14
+diff -u -r1.13 -r1.14
+--- libc/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h 2006/01/13 07:58:57 1.13
++++ libc/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h 2006/04/04 06:58:58 1.14
+@@ -35,7 +35,7 @@
+ /* These definitions are normally provided by ucontext.h via
+ asm/sigcontext.h, asm/ptrace.h, and asm/elf.h. Otherwise we define
+ them here. */
+-#ifndef __PPC64_ELF_H
++#if !defined __PPC64_ELF_H && !defined _ASM_POWERPC_ELF_H
+ #define ELF_NGREG 48 /* includes nip, msr, lr, etc. */
+ #define ELF_NFPREG 33 /* includes fpscr */
+ #if __WORDSIZE == 32
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-07-19 21:55:10 UTC (rev 1675)
+++ glibc-package/trunk/debian/patches/series 2006-07-25 00:12:28 UTC (rev 1676)
@@ -110,6 +110,7 @@
powerpc/cvs-gcc41-initfini.diff -p1
powerpc/cvs-executable-got.diff -p0
+powerpc/cvs-procfs.diff -i1
powerpc/local-sysconf.diff -p1
powerpc/submitted-socket-weakalias.diff -p0
Reply to: