[arch-commits] CVS update of core/base/glibc (PKGBUILD)

[Jan de Groot]

    Date: Saturday, March 8, 2008 @ 15:09:22
  Author: jgc
    Path: /home/cvs-core/core/base/glibc

Modified: PKGBUILD (1.79 -> 1.80)

upgpkg: glibc 2.7-8
    Rebuild with new GCC. Add many new upstream patches


----------+
 PKGBUILD |   48 ++++++++++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 26 deletions(-)


Index: core/base/glibc/PKGBUILD
diff -u core/base/glibc/PKGBUILD:1.79 core/base/glibc/PKGBUILD:1.80
--- core/base/glibc/PKGBUILD:1.79	Sun Dec  2 22:17:24 2007
+++ core/base/glibc/PKGBUILD	Sat Mar  8 15:09:21 2008
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.79 2007/12/03 03:17:24 dan Exp $
+# $Id: PKGBUILD,v 1.80 2008/03/08 20:09:21 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=glibc
 pkgver=2.7
-pkgrel=7
+pkgrel=8
 install=glibc.install
 backup=(etc/locale.gen)
 pkgdesc="GNU C Library"
@@ -15,16 +15,10 @@
 replaces=('glibc-xen')
 source=(http://ftp.gnu.org/gnu/glibc/glibc-${pkgver}.tar.bz2
 	http://ftp.gnu.org/gnu/glibc/glibc-libidn-${pkgver}.tar.bz2
-	ftp://ftp.archlinux.org/other/glibc/glibc-patches-2.7-4.tar.bz2
+	ftp://ftp.archlinux.org/other/glibc/glibc-patches-2.7-8.tar.bz2
 	nscd
 	locale.gen.txt
 	locale-gen)
-md5sums=('065c5952b439deba40083ccd67bcc8f7'
-         '226809992fb1f3dc6ea23e0f26952ea4'
-         '6180b68c612792ef779aefb78d2d0de2'
-         'b587ee3a70c9b3713099295609afde49'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
 
 build() {
   cd ${startdir}/src/glibc-${pkgver}
@@ -32,17 +26,25 @@
 
   # some important patches from Debian
   patch -Np0 -i ${startdir}/src/glibc-patches/locale.patch || return 1
-  # disabled now to fix http://bugs.archlinux.org/task/8530 - let's see if we need to reenable parts of it again
-#  patch -Np0 -i ${startdir}/src/glibc-patches/weekday.patch || return 1
-
   patch -Np1 -i ${startdir}/src/glibc-patches/glibc-2.5-localedef_segfault-1.patch || return 1
 
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=4781 - they forgot to apply it to the 2.7 branch
-  patch -Np1 -i ${startdir}/src/glibc-patches/fix_memory.diff || return 1
+  # Upstream fixes. See sources.redhat.com bugzilla
+  patch -Np1 -i ${startdir}/src/glibc-patches/glibc-2.7-bz4781.patch || return 1
+  patch -Np1 -i ${startdir}/src/glibc-patches/glibc-2.7-bz5375.patch || return 1
+  patch -Np1 -i ${startdir}/src/glibc-patches/glibc-2.7-bz5382.patch || return 1
+  patch -Np0 -i ${startdir}/src/glibc-patches/glibc-2.7-bz5435.patch || return 1
+  patch -Np0 -i ${startdir}/src/glibc-patches/glibc-2.7-bz5441.patch || return 1
+  patch -Np1 -i ${startdir}/src/glibc-patches/glibc-2.7-bz5531.patch || return 1
+
+  # Gentoo fixes
+  patch -Np1 -i ${startdir}/src/glibc-patches/glibc-handle-long-kernel-versions.patch || return 1
+  patch -Np1 -i ${startdir}/src/glibc-patches/glibc-dont-build-timezone.patch || return 1
+  patch -Np0 -i ${startdir}/src/glibc-patches/gcc-4.3-include-fixed.patch || return 1
+
   # fix some broken locales (upstream fixes)
   patch -Np1 -i ${startdir}/src/glibc-patches/fix_broken_locales.patch || return 1
 
-  mkdir -p ${startdir}/pkg/etc
+  install -m755 -d ${startdir}/pkg/etc
   touch ${startdir}/pkg/etc/ld.so.conf
 
   mkdir glibc-build
@@ -66,24 +68,18 @@
   make install_root=${startdir}/pkg install || return 1
 
   rm -f ${startdir}/pkg/etc/ld.so.cache ${startdir}/pkg/etc/ld.so.conf ${startdir}/pkg/etc/localtime
-  rm -rf ${startdir}/pkg/usr/include/scsi
-  mkdir -p ${startdir}/pkg/etc/rc.d
-  mkdir -p ${startdir}/pkg/usr/sbin
-  mkdir -p ${startdir}/pkg/usr/lib/locale
+
+  install -m755 -d ${startdir}/pkg/etc/rc.d
+  install -m755 -d ${startdir}/pkg/usr/sbin
+  install -m755 -d ${startdir}/pkg/usr/lib/locale
   install -m644 ${startdir}/src/glibc-${pkgver}/nscd/nscd.conf ${startdir}/pkg/etc/nscd.conf
   install -m755 ${startdir}/src/nscd ${startdir}/pkg/etc/rc.d/nscd
   install -m755 ${startdir}/src/locale-gen ${startdir}/pkg/usr/sbin
 
   sed -i -e 's/^\tserver-user/#\tserver-user/' ${startdir}/pkg/etc/nscd.conf || return 1
 
-  # remove timezones data files - provided now in a seperate pkg
-  rm -fv ${startdir}/pkg/usr/bin/tzselect
-  rm -fv ${startdir}/pkg/usr/man
-  rm -fv ${startdir}/pkg/usr/sbin/{zdump,zic}
-  rm -rfv ${startdir}/pkg/usr/share/zoneinfo
-
   # create /etc/locale.gen
-  cp ${startdir}/src/locale.gen.txt ${startdir}/pkg/etc/locale.gen
+  install -m644 ${startdir}/src/locale.gen.txt ${startdir}/pkg/etc/locale.gen
   sed -i "s|/| |g" ${startdir}/src/glibc-${pkgver}/localedata/SUPPORTED
   sed -i 's|\\| |g' ${startdir}/src/glibc-${pkgver}/localedata/SUPPORTED
   sed -i "s|SUPPORTED-LOCALES=||" ${startdir}/src/glibc-${pkgver}/localedata/SUPPORTED