Update glibc without lib32.

1 files changed, 29 insertions, 32 deletions

diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index a6d490f36..6af3811e8 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -8,6 +8,8 @@ pkgname=glibc
 pkgver=2.14.1
 pkgrel=1
 _glibcdate=20111025
+_glibcportsver=2.14
+_glibcportsdate=20110908
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libc"
@@ -21,7 +23,7 @@ backup=(etc/gai.conf
 options=('!strip')
 install=glibc.install
 source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz
-        http://repo.parabolagnulinux.org/other/glibc-ports-${pkgver}_${_glibcdate}.tar.xz
+        http://repo.parabolagnulinux.org/other/glibc-ports-${_glibcportsver}_${_glibcportsdate}.tar.xz
         glibc-2.10-dont-build-timezone.patch
         glibc-2.10-bz4781.patch
         glibc-__i686.patch
@@ -112,20 +114,14 @@ build() {
     extra_addons=",ports"
   fi
 
-  if [[ ${CARCH} != "mips64el" ]]; then
-      echo "slibdir=/lib" >> configparms
-      libdir=/usr/lib
-  else
-      echo "slibdir=/lib32" >> configparms
-      libdir=/usr/lib32
-  fi
+  echo "slibdir=/lib" >> configparms
 
   # remove hardening options from CFLAGS for building libraries
   CFLAGS=${CFLAGS/-fstack-protector/}
   CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
 
   ${srcdir}/glibc/configure --prefix=/usr \
-      --libdir=$libdir --libexecdir=$libdir \
+      --libdir=/usr/lib --libexecdir=/usr/lib \
       --with-headers=/usr/include \
       --enable-add-ons=nptl,libidn$extra_addons \
       --enable-kernel=2.6.27 \
@@ -159,19 +155,11 @@ package() {
   cd ${srcdir}/glibc-build
   make install_root=${pkgdir} install
 
-  if [[ ${CARCH} != "mips64el" ]]; then
-      libdir=usr/lib
-      slibdir=lib
-  else
-      libdir=usr/lib32
-      slibdir=lib32
-  fi
-
   rm -f ${pkgdir}/etc/ld.so.{cache,conf}
 
   install -dm755 ${pkgdir}/etc/rc.d
   install -dm755 ${pkgdir}/usr/sbin
-  install -dm755 ${pkgdir}/${libdir}/locale
+  install -dm755 ${pkgdir}/usr/lib/locale
   install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
   install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd
   install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
@@ -194,12 +182,6 @@ package() {
     mkdir ${pkgdir}/lib64
     cd ${pkgdir}/lib64
     ln -v -s ../lib/ld* .
-  elif [[ ${CARCH} = "mips64el" ]]; then
-    # Previously our binaries used /lib/ld.so.1 as the interpreter, we
-    # don't want the upgrade to fail due to this.
-    mkdir ${pkgdir}/lib
-    cd ${pkgdir}/lib
-    ln -s ../lib32/ld* .
   fi
   
   # manually strip files as stripping libpthread-*.so and libthread_db.so
@@ -210,16 +192,31 @@ package() {
   strip $STRIP_BINARIES sbin/{ldconfig,sln} \
                         usr/bin/{gencat,getconf,getent,iconv,locale} \
                         usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \
-                        $libdir/getconf/* \
+                        usr/lib/getconf/* \
                         usr/sbin/{iconvconfig,nscd}
   [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
 
-  strip $STRIP_STATIC $libdir/*.a \
-                      $slibdir/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so
+  strip $STRIP_STATIC usr/lib/*.a \
+                      lib/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so
 
-  strip $STRIP_SHARED $slibdir/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \
-                      $slibdir/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
-                      $slibdir/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
-                      $slibdir/{libmemusage,libpcprofile,libSegFault}.so \
-                      $libdir/{pt_chown,{audit,gconv}/*.so}
+  strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \
+                      lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
+                      lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
+                      lib/{libmemusage,libpcprofile,libSegFault}.so \
+                      usr/lib/{pt_chown,{audit,gconv}/*.so}
 }
+md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1'
+         '46569182a7ac0b94c0b1d643ab277dfa'
+         '4dadb9203b69a3210d53514bb46f41c3'
+         '0c5540efc51c0b93996c51b57a8540ae'
+         '40cd342e21f71f5e49e32622b25acc52'
+         'a3ac6f318d680347bb6e2805d42b73b2'
+         'b042647ea7d6f22ad319e12e796bd13e'
+         '7d0154b7e17ea218c9fa953599d24cc4'
+         '6970bcfeb3bf88913436d5112d16f588'
+         '7da8c554a3b591c7401d7023b1928afc'
+         'c5de2a946215d647c8af5432ec4b0da0'
+         '55febbb72139ac7b65757df085024b83'
+         'b587ee3a70c9b3713099295609afde49'
+         '07ac979b6ab5eeb778d55f041529d623'
+         '476e9113489f93b348b21e144b6a8fcf')