[Lunar-commits] <moonbase> glibc: version bumped to 2.14.1.

[Florin Braescu]

commit cdab5faabd1f72e069d82ee690dbb5f0cbfa2bf6
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Mon Oct 31 12:43:03 2011 +0100

    glibc: version bumped to 2.14.1.
---
 libs/glibc/BUILD        |    9 +++++++--
 libs/glibc/BUILD.x86_64 |   17 +++++++++--------
 libs/glibc/DEPENDS      |    3 ++-
 libs/glibc/DETAILS      |   12 ++++++++----
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 184f2bf..398f8c0 100644
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -9,7 +9,7 @@
   export CC_OPTS=( Pipe ) &&
 
   # There is no other option but nptl
-  OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls" &&
+  OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=`installed_version kernel-headers-2.6`" &&
 
   if [ -n "$MAKES" ] && [ "$MAKES" -gt 1 ] ; then
     sedit "s/# PARALLELMFLAGS = -j 4/PARALLELMFLAGS = -j $MAKES/" Makefile.in
@@ -25,6 +25,11 @@
 
   patch_it $SOURCE2 1 &&
   patch_it $SOURCE3 1 &&
+  patch_it $SOURCE4 1 &&
+  patch_it $SOURCE5 1 &&
+
+  sedit 's/test-netdb tst-nss-test1/test-netdb/' nss/Makefile &&
+  sedit '/libnss_test1/d' shlib-versions &&
 
   INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot &&
   mkdir -p $INSTALL_ROOT &&
@@ -36,7 +41,7 @@
                --infodir=/usr/share/info  \
                --mandir=/usr/share/man    \
                --with-elf                 \
-               --with-gd=no               \
+               --without-gd               \
                --without-cvs              \
                --enable-shared            \
                --disable-multi-arch       \
diff --git a/libs/glibc/BUILD.x86_64 b/libs/glibc/BUILD.x86_64
index 0d69e06..82b3508 100644
--- a/libs/glibc/BUILD.x86_64
+++ b/libs/glibc/BUILD.x86_64
@@ -7,7 +7,7 @@
   mkdir -p $SOURCE_DIRECTORY/tmp &&
 
   # There is no other option but nptl
-  OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls" &&
+  OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile" &&
 
   if [ -n "$MAKES" ] && [ "$MAKES" -gt 1 ] ; then
     sedit "s/# PARALLELMFLAGS = -j 4/PARALLELMFLAGS = -j $MAKES/" Makefile.in
@@ -23,6 +23,8 @@
 
   patch_it $SOURCE2 1 &&
   patch_it $SOURCE3 1 &&
+  patch_it $SOURCE4 1 &&
+  patch_it $SOURCE5 1 &&
 
   INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot &&
   mkdir -p $INSTALL_ROOT &&
@@ -34,7 +36,7 @@
                --infodir=/usr/share/info  \
                --mandir=/usr/share/man    \
                --with-elf                 \
-               --with-gd=no               \
+               --without-gd               \
                --without-cvs              \
                --enable-shared            \
                --host=$BUILD              \
@@ -46,12 +48,11 @@
   make || exit 1 &&
 
   # Preserve the old glibc temporarily
-  LD=/lib/ld-linux.so.2  &&
-  LD=/lib/ld-linux-x86-64.so.2  && 
-  GLIBC=/lib/libc.so.6   &&
-  DL=/lib/libdl.so.2     &&
-  M=/lib/libm.so.6       &&
-  RT=/lib/librt.so.1     &&
+  LD=/lib/ld-linux-x86-64.so.2  &&
+  GLIBC=/lib/libc.so.6          &&
+  DL=/lib/libdl.so.2            &&
+  M=/lib/libm.so.6              &&
+  RT=/lib/librt.so.1            &&
   PTHREAD=/lib/libpthread.so.0  &&
   NSS=/lib/libnss_files.so.2    &&
   UTIL=/lib/libutil.so.1        &&
diff --git a/libs/glibc/DEPENDS b/libs/glibc/DEPENDS
index e49dae3..dcff1f1 100644
--- a/libs/glibc/DEPENDS
+++ b/libs/glibc/DEPENDS
@@ -1,5 +1,6 @@
 depends  gawk
 depends  sed
-depends  perl
 depends  texinfo
 depends  kernel-headers-2.6
+
+optional_depends "perl" "" "" "for testing the installation"
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index d934723..d479cdf 100644
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -1,8 +1,10 @@
           MODULE=glibc
-         VERSION=2.12.2
-          SOURCE=$MODULE-$VERSION.tar.bz2
+         VERSION=2.14.1
+          SOURCE=$MODULE-$VERSION.tar.xz
          SOURCE2=$MODULE-2.11-no_timezones.patch.bz2
          SOURCE3=$MODULE-2.11.1-__i686.patch.bz2
+         SOURCE4=$MODULE-2.13-gcc_fix-1.patch.bz2
+         SOURCE5=$MODULE-2.14.1-nss_test1.patch.bz2
    SOURCE_URL[0]=$GNU_URL/$MODULE
    SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$MODULE
    SOURCE_URL[2]=http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/glibc
@@ -10,12 +12,14 @@
      SOURCE3_URL=$PATCH_URL
      SOURCE4_URL=$PATCH_URL
      SOURCE5_URL=$PATCH_URL
-      SOURCE_VFY=sha1:3ef6d36eee2dc7c4351f215f689e6a04c161a35e
+      SOURCE_VFY=sha1:41ead3cdc99a40a17d5830672c36b49b1d7b79f7
      SOURCE2_VFY=sha1:fc5bf75815daeeef52f7558f27992e02c2cdc87d
      SOURCE3_VFY=sha1:e3f36e2bb17e51e31035f2cd405d099c624d0e9e
+     SOURCE4_VFY=sha1:2fa2f8b8920c5009a864cc0b0ec5fcccee4c84a5
+     SOURCE5_VFY=sha1:4f22e3bd256652e21d6208666fef815021c1ecab
         WEB_SITE=http://www.gnu.org/software/libc
          ENTERED=20010922
-         UPDATED=20101215
+         UPDATED=20111031
            SHORT="C library for use with GNU/Hurd and GNU/Linux"
            PSAFE=no