X-Git-Url: http://gitweb/?a=blobdiff_plain;f=glibc%2FPkgfile;h=6313e3a5595bd3c823ab1c44b8baa3b329267992;hb=02834ec38bd2200c04356b84386154458303c7f4;hp=a175ac2d387affa3b3299083cb3cc34fe322eb48;hpb=6dca1d213a39ee6af51632926e8b7c8914215cd9;p=crossrootfs.git

diff --git a/glibc/Pkgfile b/glibc/Pkgfile
index a175ac2..6313e3a 100644
--- a/glibc/Pkgfile
+++ b/glibc/Pkgfile
@@ -1,46 +1,40 @@
 # 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.9
-release=1
-source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2 \
-        ftp://ftp.gnu.org/gnu/$name/$name-ports-$version.tar.bz2 \
-        $name-$version-libgcc_eh-1.patch \ 
-        $name-$version-localedef_segfault-1.patch \
+version=2.12.2
+release=2
+source=(http://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz \
+        ftp://ftp.gnu.org/gnu/$name/$name-ports-2.12.1.tar.bz2 \
+        ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.35.tar.gz \
+        glibc-ignore_origin.patch \
+        Optimize-__getpagesize-a-bit.patch \
         $name-$version-cross_hacks-2.patch \
-        $name-$version-nptl_lowlevellock-1.patch \
-        $name-$version-arm_setjmp_fix-1.patch \
-        ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.8.tar.bz2 \
         hosts resolv.conf nsswitch.conf host.conf ld.so.conf)
 
 build() {
   # install build kernel headers
-  cd linux-2.6.28.8
+  cd linux-2.6.35
   make mrproper
   make ARCH=arm headers_check
   make ARCH=arm INSTALL_HDR_PATH=$PKG/usr headers_install
-  cd $SRC
 
-  mv $name-ports-$version $name-$version/ports
+  cd $SRC
+  mv $name-ports-2.12.1 $name-$version/ports
 
   pushd $name-$version
-  patch -p1 -i $SRC/$name-$version-libgcc_eh-1.patch
-  patch -p1 -i $SRC/$name-$version-localedef_segfault-1.patch
   patch -p1 -i $SRC/$name-$version-cross_hacks-2.patch
-  patch -p1 -i $SRC/$name-$version-nptl_lowlevellock-1.patch
-  patch -p1 -i $SRC/$name-$version-arm_setjmp_fix-1.patch
+  patch -R -p1 -i $SRC/Optimize-__getpagesize-a-bit.patch
+  patch -p1 -i $SRC/$name-ignore_origin.patch
   popd
 
   mkdir build
   cd build
-  
-  cat > config.cache << EOF 
-libc_cv_forced_unwind=yes
-libc_cv_c_cleanup=yes
+
+  cat > config.cache << EOF
 libc_cv_gnu89_inline=yes
 ac_cv_sizeof_long_double=0
 EOF
@@ -55,15 +49,14 @@ EOF
                               --enable-add-ons \
                               --disable-profile \
                               --without-gd \
-                              --cache-file=config.cache
+                              --with-__thread 
 
   make CC="$CC" CFLAGS="$CFLAGS"
   make install_root=$PKG install
+
   cp $SRC/{hosts,resolv.conf,nsswitch.conf,host.conf,ld.so.conf} $PKG/etc
   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.h,rquota.x}
   rm -rf $PKG/usr/share/{info,locale}
 }