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

Allan McRae allan at archlinux.org
Wed Apr 22 08:29:01 EDT 2009


    Date: Wednesday, April 22, 2009 @ 08:29:01
  Author: allan
Revision: 36432

upgpkg: glibc 2.9-5
    gcc-4.4 toolchain rebuild, update cvs snapshot, remove an old glibc-2.5 patch from Debian, remove patch that was rejected in upstream bugzilla, compress info pages, fix info page handling in install script

Modified:
  glibc/trunk/ChangeLog
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc.install
Deleted:
  glibc/trunk/fix-makecontext.patch

-----------------------+
 ChangeLog             |    8 ++++++++
 PKGBUILD              |   33 +++++++++++++++------------------
 fix-makecontext.patch |   33 ---------------------------------
 glibc.install         |    9 ++-------
 4 files changed, 25 insertions(+), 58 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-04-22 12:03:55 UTC (rev 36431)
+++ ChangeLog	2009-04-22 12:29:01 UTC (rev 36432)
@@ -1,3 +1,11 @@
+glibc 2.9-5
+- gcc-4.4 toolchain build
+- new CVS checkout
+- removed glibc-2.5-localedef_segfault-1.patch
+- removed glibc-2.7-bz4781.patch
+- compress info pages
+- update handling 
+
 glibc 2.9-3
 - remove texinfo dep
 - only call install-info when needed

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-04-22 12:03:55 UTC (rev 36431)
+++ PKGBUILD	2009-04-22 12:29:01 UTC (rev 36432)
@@ -1,20 +1,22 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
 
+# toolchain build order: kernel-headers->glibc->binutils->gcc-libs->gcc->binutils->glibc
+
 pkgname=glibc
 pkgver=2.9
-pkgrel=4
-_glibcdate=20081119
+pkgrel=5
+_glibcdate=20090418
 install=glibc.install
 backup=(etc/locale.gen
 	etc/nscd.conf)
 pkgdesc="GNU C Library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
 url="http://www.gnu.org/software/libc"
 groups=('base')
-depends=('kernel-headers>=2.6.27.6' 'tzdata')
+depends=('kernel-headers>=2.6.29.1' 'tzdata')
 makedepends=('gcc>=4.3.2-2')
 replaces=('glibc-xen')
 source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.bz2
@@ -22,7 +24,7 @@
 	nscd
 	locale.gen.txt
 	locale-gen)
-md5sums=('1f7cc590a7a9bbef8b09fe89af69fb8c'
+md5sums=('fcea264758b93e279e399cd651ad6a74'
          '7679e2bcd981847efccb2bad9e57fee3'
          'b587ee3a70c9b3713099295609afde49'
          '07ac979b6ab5eeb778d55f041529d623'
@@ -36,18 +38,12 @@
   export _TAG=glibc-2_9-branch
   export 'CVSROOT=:pserver:anoncvs at sources.redhat.com:/cvs/glibc'
 #  cvs -z9 co -r $_TAG libc || return 1
-#  tar -cvjf ../../glibc-2.9_${_glibcdate}.tar.bz2 libc
+#  tar -cvjf ${startdir}/glibc-2.9_${_glibcdate}.tar.bz2 libc
 #  return 1
 
   cd ${srcdir}/libc
 
-  # patch from Debian
-  patch -Np1 -i ${srcdir}/glibc-patches/glibc-2.5-localedef_segfault-1.patch || return 1 # still needed?
-
-  # Upstream fixes. See sources.redhat.com bugzilla
-  patch -Np1 -i ${srcdir}/glibc-patches/glibc-2.7-bz4781.patch || return 1
-
-  # Gentoo fixes
+  # timezone data is in separate package (tzdata)
   patch -Np1 -i ${srcdir}/glibc-patches/glibc-dont-build-timezone.patch || return 1
 
   # fixes taken from FC10 2.9-3 rpm, fixes FS#12215
@@ -56,7 +52,7 @@
   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
 
-  install -m755 -d ${pkgdir}/etc
+  install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 
   mkdir glibc-build
@@ -81,9 +77,9 @@
 
   rm -f ${pkgdir}/etc/ld.so.cache ${pkgdir}/etc/ld.so.conf ${pkgdir}/etc/localtime
 
-  install -m755 -d ${pkgdir}/etc/rc.d
-  install -m755 -d ${pkgdir}/usr/sbin
-  install -m755 -d ${pkgdir}/usr/lib/locale
+  install -dm755 ${pkgdir}/etc/rc.d
+  install -dm755 ${pkgdir}/usr/sbin
+  install -dm755 ${pkgdir}/usr/lib/locale
   install -m644 ${srcdir}/libc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
   install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd
   install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
@@ -108,4 +104,5 @@
   fi
 
   rm -f ${pkgdir}/usr/share/info/dir
+  gzip -9 ${pkgdir}/usr/share/info/*
 }

Deleted: fix-makecontext.patch
===================================================================
--- fix-makecontext.patch	2009-04-22 12:03:55 UTC (rev 36431)
+++ fix-makecontext.patch	2009-04-22 12:29:01 UTC (rev 36432)
@@ -1,33 +0,0 @@
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/i386/makecontext.S,v
-retrieving revision 1.8
-retrieving revision 1.9
-diff -u -r1.8 -r1.9
---- libc/sysdeps/unix/sysv/linux/i386/makecontext.S	2007/12/03 04:56:56	1.8
-+++ libc/sysdeps/unix/sysv/linux/i386/makecontext.S	2008/01/09 19:35:15	1.9
-@@ -1,5 +1,5 @@
- /* Create new context.
--   Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
-+   Copyright (C) 2001, 2002, 2005, 2007, 2008 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper at redhat.com>, 2001.
- 
-@@ -41,13 +41,15 @@
- 	movl	12(%esp), %ecx
- 	movl	%ecx, oEBX(%eax)
- 
--	/* Make room on the new stack for the parameters.  */
-+	/* Make room on the new stack for the parameters.
-+	   Room for the arguments, return address (== L(exitcode)) and
-+	   oLINK pointer is needed.  One of the pointer sizes is subtracted
-+	   after aligning the stack.  */
- 	negl	%ecx
--	leal	-8(%edx,%ecx,4), %edx
-+	leal	-4(%edx,%ecx,4), %edx
- 	negl	%ecx
- 
- 	/* Align the stack.  */
--	addl	$16, %edx
- 	andl	$0xfffffff0, %edx
- 	subl	$4, %edx
- 

Modified: glibc.install
===================================================================
--- glibc.install	2009-04-22 12:03:55 UTC (rev 36431)
+++ glibc.install	2009-04-22 12:29:01 UTC (rev 36432)
@@ -33,11 +33,6 @@
 
  fi
 fi
-
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
-    usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null
- done
 }
 
 post_upgrade() {
@@ -124,13 +119,13 @@
 
  [ -x usr/bin/install-info ] || return 0
  for file in ${filelist[@]}; do
-    usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null
+    usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null
  done
 }
 
 pre_remove() {
   [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
-    usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+    usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }



More information about the arch-commits mailing list