[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r4876 - glibc-package/branches/glibc-branch-squeeze/debian/patches



Author: aurel32
Date: 2011-08-12 20:40:02 +0000 (Fri, 12 Aug 2011)
New Revision: 4876

Modified:
   glibc-package/branches/glibc-branch-squeeze/debian/patches/svn-updates.diff
Log:
Remove broken backport


Modified: glibc-package/branches/glibc-branch-squeeze/debian/patches/svn-updates.diff
===================================================================
--- glibc-package/branches/glibc-branch-squeeze/debian/patches/svn-updates.diff	2011-08-12 19:07:34 UTC (rev 4875)
+++ glibc-package/branches/glibc-branch-squeeze/debian/patches/svn-updates.diff	2011-08-12 20:40:02 UTC (rev 4876)
@@ -637,7 +637,7 @@
     Architectures must provide a few lowlevel macros (the compare
 --- a/ChangeLog	(revision 12231)
 +++ b/ChangeLog	(revision 14920)
-@@ -1,3 +1,374 @@
+@@ -1,3 +1,369 @@
 +2011-05-17  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +	[BZ #12775]
@@ -779,11 +779,6 @@
 +	Maintain aligned stack.
 +	(CHECK_RSP): Remove unused macro.
 +
-+2011-04-01  Andreas Schwab  <schwab@redhat.com>
-+
-+	* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add
-+	bits/timex.h
-+
 +2011-03-18  Ulrich Drepper  <drepper@gmail.com>
 +
 +	[BZ #12583]
@@ -1184,17 +1179,6 @@
  # define MADV_HWPOISON	  100	/* Poison a page for testing.  */
  #endif
  
---- a/sysdeps/unix/sysv/linux/Makefile	(revision 12231)
-+++ b/sysdeps/unix/sysv/linux/Makefile	(revision 14920)
-@@ -96,7 +96,7 @@
- endif
- 
- ifeq ($(subdir),time)
--sysdep_headers += sys/timex.h
-+sysdep_headers += sys/timex.h bits/timex.h
- 
- sysdep_routines += ntp_gettime
- endif
 --- a/sysdeps/unix/sysv/linux/mkdirat.c	(revision 12231)
 +++ b/sysdeps/unix/sysv/linux/mkdirat.c	(revision 14920)
 @@ -1,4 +1,4 @@


Reply to: