[Lunar-commits] <moonbase> glibc: restored RPC which is REQUIRED for many core, critical modules build. If you are going to commit such critical module like glibc present your work on dev ML first for acceptance.

[Zbigniew Luszpinski]

commit 5af59b5796a822ea4db18988e6537df7811e1c09
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Tue Nov 1 14:17:24 2011 +0100

    glibc: restored RPC which is REQUIRED for many core, critical modules build.
    If you are going to commit such critical module like glibc present your work on dev ML first for acceptance.
---
 libs/glibc/BUILD        |   19 ++++++++++---------
 libs/glibc/BUILD.x86_64 |    8 +++++++-
 libs/glibc/DETAILS      |    5 ++++-
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 398f8c0..0842c37 100644
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -27,7 +27,8 @@
   patch_it $SOURCE3 1 &&
   patch_it $SOURCE4 1 &&
   patch_it $SOURCE5 1 &&
-
+  patch_it $SOURCE6 1 &&
+  sedit 's/^# \(.* := rpcinfo\)/\1/p'  sunrpc/Makefile &&
   sedit 's/test-netdb tst-nss-test1/test-netdb/' nss/Makefile &&
   sedit '/libnss_test1/d' shlib-versions &&
 
@@ -51,11 +52,11 @@
   make || exit 1 &&
 
   # Preserve the old glibc temporarily
-  LD=/lib/ld-linux.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.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        &&
@@ -101,13 +102,13 @@
   sln /lib/libcrypt-lunar.so $CRYPT      &&
 
   # clean hack to make sure gnu/stubs.h gets refreshed
-  rm -f /usr/include/gnu/stubs.h &&
+  rm -f /usr/include/gnu/stubs.h  &&
 
   # This removes the old glibc
-  prepare_install &&
+  prepare_install  &&
 
   # And now we install the new
-  make install &&
+  make install  &&
 
   # Now optionally perform debug symbol stripping only
   if [ "$STRIP" == "y" ] ; then
diff --git a/libs/glibc/BUILD.x86_64 b/libs/glibc/BUILD.x86_64
index 82b3508..d08cb4e 100644
--- a/libs/glibc/BUILD.x86_64
+++ b/libs/glibc/BUILD.x86_64
@@ -6,8 +6,10 @@
   sedit "s:/tmp:$SOURCE_DIRECTORY/tmp:g" scripts/test-installation.pl &&
   mkdir -p $SOURCE_DIRECTORY/tmp &&
 
+  export CC_OPTS=( Pipe ) &&
+
   # There is no other option but nptl
-  OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile" &&
+  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 +27,10 @@
   patch_it $SOURCE3 1 &&
   patch_it $SOURCE4 1 &&
   patch_it $SOURCE5 1 &&
+  patch_it $SOURCE6 1 &&
+  sedit 's/^# \(.* := rpcinfo\)/\1/p'  sunrpc/Makefile &&
+  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 &&
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index d479cdf..8395c3c 100644
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -5,6 +5,7 @@
          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
+         SOURCE6=$MODULE-2.14.1-rpc-restore.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
@@ -12,14 +13,16 @@
      SOURCE3_URL=$PATCH_URL
      SOURCE4_URL=$PATCH_URL
      SOURCE5_URL=$PATCH_URL
+     SOURCE6_URL=$PATCH_URL
       SOURCE_VFY=sha1:41ead3cdc99a40a17d5830672c36b49b1d7b79f7
      SOURCE2_VFY=sha1:fc5bf75815daeeef52f7558f27992e02c2cdc87d
      SOURCE3_VFY=sha1:e3f36e2bb17e51e31035f2cd405d099c624d0e9e
      SOURCE4_VFY=sha1:2fa2f8b8920c5009a864cc0b0ec5fcccee4c84a5
      SOURCE5_VFY=sha1:4f22e3bd256652e21d6208666fef815021c1ecab
+     SOURCE6_VFY=sha1:268509d8df9aa802747b84c4e46925fb65f30737
         WEB_SITE=http://www.gnu.org/software/libc
          ENTERED=20010922
-         UPDATED=20111031
+         UPDATED=20111101
            SHORT="C library for use with GNU/Hurd and GNU/Linux"
            PSAFE=no