glibc: Aligned with upstream

[crossrootfs.git] / glibc / Pkgfile

diff --git a/glibc/Pkgfile b/glibc/Pkgfile
index afc324e0970053e68a14653b5f736f633c13529b..d0e5ffab104ba5984e6c8657ba117c5891038059 100644 (file)
--- a/glibc/Pkgfile
+++ b/glibc/Pkgfile
@@ -1,21 +1,23 @@
 # Description: The C library used in the GNU system
 # URL: http://www.gnu.org/software/libc/
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Arch Maintainer: CRUX-ARM System Team, crux-arm at mikeux dot dyndns dot org
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Depends on:
 
 name=glibc
-version=2.10.1
-release=1
-source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2 \
+version=2.16.0
+release=4
+source=(http://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz \
         ftp://ftp.gnu.org/gnu/$name/$name-ports-$version.tar.bz2 \
-        ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 \
-        $name-$version-cross_hacks-2.patch \
+        ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-3.4.11.tar.xz \
+        $name-resolv_assert.patch
+        $name-strtod_integer_overflow.patch
+        $name-regexp_buffer_overrun.patch
         hosts resolv.conf nsswitch.conf host.conf ld.so.conf)
 
 build() {
   # install build kernel headers
-  cd linux-2.6.29
+  cd linux-3.4.11
   make mrproper
   make ARCH=arm headers_check
   make ARCH=arm INSTALL_HDR_PATH=$PKG/usr headers_install
@@ -24,15 +26,18 @@ build() {
   mv $name-ports-$version $name-$version/ports
 
   pushd $name-$version
-  patch -p1 -i $SRC/$name-$version-cross_hacks-2.patch
+  patch -p1 -i $SRC/$name-resolv_assert.patch
+  patch -p1 -i $SRC/$name-strtod_integer_overflow.patch
+  patch -p1 -i $SRC/$name-regexp_buffer_overrun.patch
   popd
 
   mkdir build
   cd build
 
   cat > config.cache << EOF
-libc_cv_gnu89_inline=yes
-ac_cv_sizeof_long_double=0
+libc_cv_forced_unwind=yes
+libc_cv_ctors_header=yes
+libc_cv_c_cleanup=yes
 EOF
 
   ../$name-$version/configure --build=$CHOST \
@@ -41,11 +46,12 @@ EOF
                               --libexecdir=/usr/lib \
                               --with-headers=$PKG/usr/include \
                               --with-tls \
-                              --enable-kernel=2.6.0 \
+                              --enable-kernel=2.6.25 \
                               --enable-add-ons \
                               --disable-profile \
                               --without-gd \
-                              --with-__thread 
+                              --with-__thread \
+                              --enable-obsolete-rpc
 
   make CC="$CC" CFLAGS="$CFLAGS"
   make install_root=$PKG install
@@ -54,7 +60,7 @@ EOF
   ln -sf ../usr/share/zoneinfo/UTC $PKG/etc/localtime
   mkdir -p $PKG/etc/ld.so.conf.d $PKG/usr/lib/locale
 
-  # conflicts with quota
-  rm $PKG/usr/include/rpcsvc/{rquota.x,rquota.h}
-  rm -rf $PKG/usr/share/{info,locale}
+  rm -rf $PKG/usr/share/{info,locale} \
+         $PKG/usr/bin/tzselect \
+         $PKG/usr/sbin/z{dump,ic}
 }