[Lunar-commits] r26442 - moonbase/branches/crater/libs/glibc-new

[Moritz Heiber]

Author: moe
Date: 2007-10-27 22:31:22 +0200 (Sat, 27 Oct 2007)
New Revision: 26442

Modified:
   moonbase/branches/crater/libs/glibc-new/BUILD
Log:
Please do not commit changes to this module that only fix issues for
your system. This module has been widely tested by a couple of users
on either bit architecure, may it be 32 or 64, and there were no re-
ported problems so far. I'd rather dig into your issues first.

Also, be advised, you're using a non-standard gcc and arbitary
optimizations.



Modified: moonbase/branches/crater/libs/glibc-new/BUILD
===================================================================
--- moonbase/branches/crater/libs/glibc-new/BUILD	2007-10-27 20:22:53 UTC (rev 26441)
+++ moonbase/branches/crater/libs/glibc-new/BUILD	2007-10-27 20:31:22 UTC (rev 26442)
@@ -7,38 +7,33 @@
     sedit "s/# PARALLELMFLAGS = -j 4/PARALLELMFLAGS = -j $MAKES/" Makefile.in
   fi
 
-  # Don't allow too much damage
-  unset CFLAGS CXXFLAGS CPPFLAGS LD_LIBRARY_PATH
+  export CC=gcc
 
-  # glibc wants -march=i486 greater or less is NOT compiling.
-  export CC="gcc -march=i486"
-  export CXX="g++ -march=i486"
-
   # Don't fully strip libc
   if [[ "$LDFLAGS" == *-s* ]] ; then
     STRIP=y
   fi
   unset LDFLAGS 
 
-  INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot  &&
-  mkdir -p $INSTALL_ROOT  &&
+  INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot &&
+  mkdir -p $INSTALL_ROOT &&
   cd $INSTALL_ROOT
 
   # We want the newest available headers
   OPTS="$OPTS --with-headers=/usr/src/linux/include"
 
-  ../configure --prefix=/usr              \
-               --infodir=/usr/share/info  \
-               --mandir=/usr/share/man    \
-               --with-elf                 \
-               --with-gd=no               \
-               --without-cvs              \
-               --enable-shared            \
-               --with-kernel=2.6.20.0     \
-               $OPTS                     &&
+  ../configure --prefix=/usr                           \
+               --infodir=/usr/share/info               \
+               --mandir=/usr/share/man                 \
+               --with-elf                              \
+               --with-gd=no                            \
+               --without-cvs                           \
+               --enable-shared                         \
+               --with-kernel=2.6.20.0                  \
+               $OPTS                                  &&
 
   # explicitly exit here since the following code unsets $?
-  make || exit 1  &&
+  make || exit 1 &&
 
   # Preserve the old glibc temporarily
   LD=/lib/ld-linux.so.2
@@ -91,13 +86,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
@@ -126,7 +121,7 @@
   if [ -z "$GLIBC_LOCALES" ]; then
     make localedata/install-locales || exit 1
   else
-    devoke_installwatch  &&
+    devoke_installwatch &&
     for LOCALE in $GLIBC_LOCALES; do
       INPUTFILE=$(echo $LOCALE | cut -d/ -f1 | sed -e 's:\..*$::g')
       OUTPUTFILE=$(echo $LOCALE | cut -d/ -f1)
@@ -135,7 +130,7 @@
       echo "localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE"
       localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE
     done
-    invoke_installwatch  &&
+    invoke_installwatch &&
     touch /usr/lib/locale/locale-archive
   fi