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

[Allan McRae]

    Date: Tuesday, April 28, 2009 @ 08:27:48
  Author: allan
Revision: 36909

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

........
  r36903 | allan | 2009-04-28 10:54:08 +0000 (Tue, 28 Apr 2009) | 2 lines
  
  upgpkg: glibc 2.9-6
      fix issues with gdb (FS#14481)
........
  r36905 | allan | 2009-04-28 11:05:53 +0000 (Tue, 28 Apr 2009) | 1 line
  
  clarify comment in PKGBUILD
........

Modified:
  glibc/repos/testing-x86_64/	(properties)
  glibc/repos/testing-x86_64/ChangeLog
  glibc/repos/testing-x86_64/PKGBUILD

-----------+
 ChangeLog |    4 ++++
 PKGBUILD  |    9 ++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)


Property changes on: glibc/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /glibc/trunk:1-36588
   + /glibc/trunk:1-36908

Modified: testing-x86_64/ChangeLog
===================================================================
--- testing-x86_64/ChangeLog	2009-04-28 12:03:53 UTC (rev 36908)
+++ testing-x86_64/ChangeLog	2009-04-28 12:27:48 UTC (rev 36909)
@@ -1,3 +1,7 @@
+glibc 2.9-6
+- apply upstream patch to fix gdb issue
+  due to gcc optimization
+
 glibc 2.9-5
 - gcc-4.4 toolchain build
 - new CVS checkout

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-04-28 12:03:53 UTC (rev 36908)
+++ testing-x86_64/PKGBUILD	2009-04-28 12:27:48 UTC (rev 36909)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.9
-pkgrel=5
+pkgrel=6
 _glibcdate=20090418
 install=glibc.install
 backup=(etc/locale.gen
@@ -20,12 +20,12 @@
 makedepends=('gcc>=4.3.2-2')
 replaces=('glibc-xen')
 source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.bz2
-	ftp://ftp.archlinux.org/other/glibc/glibc-patches-${pkgver}-2.tar.gz
+	ftp://ftp.archlinux.org/other/glibc/glibc-patches-${pkgver}-6.tar.gz
 	nscd
 	locale.gen.txt
 	locale-gen)
 md5sums=('fcea264758b93e279e399cd651ad6a74'
-         '7679e2bcd981847efccb2bad9e57fee3'
+         '59bbb2c88720dfc4d52a1bbda1931553'
          'b587ee3a70c9b3713099295609afde49'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
@@ -52,6 +52,9 @@
   patch -Np1 -i ${srcdir}/glibc-patches/glibc-nss_dns-gethostbyname4-disable.patch || return 1
   patch -Np1 -i ${srcdir}/glibc-patches/glibc-fixes1.patch || return 1
 
+  # fixes for gdb taken from upstream cvs, fixed FS#14481
+  patch -Np1 -i ${srcdir}/glibc-patches/glibc-2.9-libhread_db.patch
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf