[arch-commits] Commit in glibc/repos (4 files)

[Allan McRae]

    Date: Saturday, May 23, 2009 @ 00:23:41
  Author: allan
Revision: 39917

Merged revisions 39916 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/glibc/trunk

........
  r39916 | allan | 2009-05-23 14:22:35 +1000 (Sat, 23 May 2009) | 2 lines
  
  upgpkg: glibc 2.10.1-2
      re-fix Andy's broken java build issue
........

Added:
  glibc/repos/testing-i686/glibc-2.10-bz4781.patch
    (from rev 39916, glibc/trunk/glibc-2.10-bz4781.patch)
Modified:
  glibc/repos/testing-i686/	(properties)
  glibc/repos/testing-i686/ChangeLog
  glibc/repos/testing-i686/PKGBUILD

-------------------------+
 ChangeLog               |    8 ++++++++
 PKGBUILD                |    7 ++++++-
 glibc-2.10-bz4781.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)


Property changes on: glibc/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /glibc/trunk:1-39100
   + /glibc/trunk:1-39916

Modified: testing-i686/ChangeLog
===================================================================
--- testing-i686/ChangeLog	2009-05-23 04:22:35 UTC (rev 39916)
+++ testing-i686/ChangeLog	2009-05-23 04:23:41 UTC (rev 39917)
@@ -1,3 +1,11 @@
+glibc-2.10.1-2
+- readd bz4781 patch
+
+glibc-2.10.1-1
+- bump to 2.10 branch
+- switch checkout to git
+- remove patches for nss and gdb
+
 glibc 2.9-7
 - actually apply patch "applied" in 2.9-6...
 

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-05-23 04:22:35 UTC (rev 39916)
+++ testing-i686/PKGBUILD	2009-05-23 04:23:41 UTC (rev 39917)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.10.1
-pkgrel=1
+pkgrel=2
 _glibcdate=20090511
 install=glibc.install
 backup=(etc/locale.gen
@@ -21,11 +21,13 @@
 replaces=('glibc-xen')
 source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.bz2
 	glibc-2.10-dont-build-timezone.patch
+	glibc-2.10-bz4781.patch
 	nscd
 	locale.gen.txt
 	locale-gen)
 md5sums=('7a34595abeeedb9aab758aa51d09ed88'
          '4dadb9203b69a3210d53514bb46f41c3'
+         '0c5540efc51c0b93996c51b57a8540ae'
          'b587ee3a70c9b3713099295609afde49'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
@@ -47,6 +49,9 @@
   # timezone data is in separate package (tzdata)
   patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch || return 1
 
+  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
+  patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch || return 1
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 

Copied: glibc/repos/testing-i686/glibc-2.10-bz4781.patch (from rev 39916, glibc/trunk/glibc-2.10-bz4781.patch)
===================================================================
--- testing-i686/glibc-2.10-bz4781.patch	                        (rev 0)
+++ testing-i686/glibc-2.10-bz4781.patch	2009-05-23 04:23:41 UTC (rev 39917)
@@ -0,0 +1,42 @@
+diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-09 13:35:30.000000000 +1000
++++ glibc/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-23 13:27:46.000000000 +1000
+@@ -120,9 +120,6 @@
+ 	ret
+ 
+ L(thread_start):
+-	cfi_startproc;
+-	/* Clearing frame pointer is insufficient, use CFI.  */
+-	cfi_undefined (eip);
+ 	/* Note: %esi is zero.  */
+ 	movl	%esi,%ebp	/* terminate the stack frame */
+ #ifdef RESET_PID
+@@ -155,7 +152,6 @@
+ 	jmp	L(haspid)
+ 	.previous
+ #endif
+-	cfi_endproc;
+ 
+ 	cfi_startproc
+ PSEUDO_END (BP_SYM (__clone))
+diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-09 13:35:30.000000000 +1000
++++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-23 13:27:46.000000000 +1000
+@@ -89,9 +89,6 @@
+ 	ret
+ 
+ L(thread_start):
+-	cfi_startproc;
+-	/* Clearing frame pointer is insufficient, use CFI.  */
+-	cfi_undefined (rip);
+ 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
+ 	   the outermost frame obviously.  */
+ 	xorl	%ebp, %ebp
+@@ -116,7 +113,6 @@
+ 	/* Call exit with return value from function call. */
+ 	movq	%rax, %rdi
+ 	call	HIDDEN_JUMPTARGET (_exit)
+-	cfi_endproc;
+ 
+ 	cfi_startproc;
+ PSEUDO_END (BP_SYM (__clone))