[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (9fab6a4cac126193ee7ccabf407448dcbb64755d)

Ladislav Hagara scm at sourcemage.org
Sat Nov 7 08:14:34 EST 2009


GIT changes to master grimoire by Ladislav Hagara <hgr at vabo.cz>:

 libs/glibc/DETAILS   |   14 +++-----------
 libs/glibc/HISTORY   |    4 ++++
 libs/glibc/PRE_BUILD |   11 -----------
 3 files changed, 7 insertions(+), 22 deletions(-)

New commits:
commit 9fab6a4cac126193ee7ccabf407448dcbb64755d
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    glibc 2.11

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 9ec2cfe..1e2560b 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -22,7 +22,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 else
   if [[ "$GLIBC_CVS" == "y" ]]; then
 local GLIBC_VERSION
-   GLIBC_VERSION=2.10.1
+   GLIBC_VERSION=2.11
     if [[ "${GLIBC_CVS_AUTOUPDATE}" == "y" ]]; then
          VERSION=${GLIBC_VERSION}-$(date +%Y%m%d) && FORCE_DOWNLOAD=on
     else 
@@ -33,7 +33,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${GLIBC_VERSION}
       SOURCE_URL=cvs://:pserver:anoncvs:anoncvs@sources.redhat.com:/cvs/glibc:libc:$SPELL-${GLIBC_VERSION/./_}-branch
    SOURCE_IGNORE=volatile
   else
-         VERSION=2.10.1
+         VERSION=2.11
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
          SOURCE2=$SOURCE.sig
@@ -41,15 +41,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
-  if [ "$GLIBC_USEIDN" = "y" ]; then
-         SOURCE4=$SPELL-libidn-$VERSION.tar.bz2
-         SOURCE5=$SOURCE4.sig
-  SOURCE4_URL[0]=$GNU_URL/$SPELL/$SOURCE4
-  SOURCE5_URL[0]=${SOURCE4_URL[0]}.sig
-     SOURCE4_GPG=gnu.gpg:$SOURCE4.sig:UPSTREAM_KEY
-  SOURCE5_IGNORE=signature
-  fi
-      PATCHLEVEL=1
+      PATCHLEVEL=0
   fi
   if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
  HEADERS_VERSION=2.6.31
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 106670f..bdf0684 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,7 @@
+2009-11-07 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.11
+	* PRE_BUILD, DETAILS: libidn again included in glibc source tarball
+
 2009-10-19 Ladislav Hagara <hgr at vabo.cz>
 	* PRE_BUILD, binutils-2.20.patch: added patch due to new binutils 2.20
 
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index d8c40f2..c3bb267 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -2,17 +2,6 @@ default_pre_build  &&
 
 patch $SOURCE_DIRECTORY/configure < $SPELL_DIRECTORY/binutils-2.20.patch &&
 
-local GLIBC_LIBIDN_DIR=$SOURCE_DIRECTORY/glibc-libidn-$VERSION  &&
-
-if [ "$GLIBC_USEIDN" = "y" ] && [[ "$GLIBC_CVS" != "y" ]]; then
-  #
-  # Unpack glibc-libidn
-  #
-  cd $SOURCE_DIRECTORY                  &&
-  unpack_file 4                         &&
-  mv $GLIBC_LIBIDN_DIR libidn
-fi &&
-
 if  [  "$GLIBC_NPTL"  =  "y"  ];  then
   cd      $SOURCE_DIRECTORY                  &&
   patch $SOURCE_DIRECTORY/timezone/Makefile  \



More information about the SM-Commit mailing list