[Lunar-commits] glibc: Don't install timezone data, let timezone-data module handle it

[Stefan Wold]

commit c4c1b92c8868a87afa157b8a095f60acd370f41e
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Tue Dec 11 23:19:04 2007 +0100

    glibc: Don't install timezone data, let timezone-data module handle it
    
    Sorry for the third glibc bump. But we decided to re-add timezone-data
    module to handle possible updates of timezones in the future without
    bumping glibc. The conflict between glibc and timezone-data is also
    resolved.
---
 libs/glibc/BUILD        |   10 ++++++----
 libs/glibc/BUILD.x86_64 |    2 ++
 libs/glibc/DETAILS      |    8 ++++++--
 libs/glibc/POST_INSTALL |    1 +
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 52bc609..74677c0 100644
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -13,7 +13,9 @@
   if [[ "$LDFLAGS" == *-s* ]] ; then
     STRIP=y
   fi
-  unset LDFLAGS 
+  unset LDFLAGS
+
+  patch_it $SOURCE3 1 &&
 
   INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot &&
   mkdir -p $INSTALL_ROOT &&
@@ -45,7 +47,7 @@
   UTIL=/lib/libutil.so.1
   NSL=/lib/libnsl.so.1
   CRYPT=/lib/libcrypt.so.1
-  
+
   case "`arch`" in
     alpha)
           GLIBC=/lib/libc.so.6.1
@@ -105,7 +107,7 @@
       strip -S $FN
     done
   fi  &&
-  
+
   # Added a symlink for ash and others
   ln -sf /usr/lib/libbsd-compat.a /usr/lib/libbsd.a  &&
 
@@ -132,5 +134,5 @@
     invoke_installwatch &&
     touch /usr/lib/locale/locale-archive
   fi
-  
+
 ) > $C_FIFO 2>&1 && ldconfig
diff --git a/libs/glibc/BUILD.x86_64 b/libs/glibc/BUILD.x86_64
index f647073..5ae9a71 100644
--- a/libs/glibc/BUILD.x86_64
+++ b/libs/glibc/BUILD.x86_64
@@ -16,6 +16,8 @@
   fi
   unset LDFLAGS 
 
+  patch_it $SOURCE3 1 &&
+
   INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot &&
   mkdir -p $INSTALL_ROOT &&
   cd $INSTALL_ROOT
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 3a097db..caa7873 100644
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -2,17 +2,21 @@
          VERSION=2.7
           SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=$MODULE-libidn-$VERSION.tar.bz2
+         SOURCE3=$MODULE-2.7-no_timezones.patch
    SOURCE_URL[0]=$GNU_URL/$MODULE/
    SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$MODULE/
   SOURCE2_URL[0]=$GNU_URL/$MODULE/
   SOURCE2_URL[1]=ftp://ftp.gnu.org/pub/gnu/$MODULE/
+     SOURCE3_URL=$PATCH_URL
       SOURCE_VFY=sha1:ccc70e95db826e4b1fd3b484154402fdc3df88f7
      SOURCE2_VFY=sha1:2338cc9b5795f5e97a19aac6d7d00ab750e81ac3
+     SOURCE3_VFY=sha1:b8cbd1725572600db0df32321a771ce0b11894c8
         WEB_SITE=http://www.gnu.org/software/libc
          ENTERED=20010922
-         UPDATED=20071118
-           PSAFE=no
+         UPDATED=20071211
            SHORT="C library for use with GNU/Hurd and GNU/Linux."
+PSAFE=no
+
 cat << EOF
 glibc - Library for use with GNU/Hurd and GNU/Linux.
 GNU C Library is one of the most important components of the GNU Hurd
diff --git a/libs/glibc/POST_INSTALL b/libs/glibc/POST_INSTALL
new file mode 100644
index 0000000..6d4458d
--- /dev/null
+++ b/libs/glibc/POST_INSTALL
@@ -0,0 +1 @@
+lin -c timezone-data