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

[Moritz Heiber]

Author: moe
Date: 2007-10-09 02:00:12 +0200 (Tue, 09 Oct 2007)
New Revision: 26137

Modified:
   moonbase/branches/crater/libs/glibc-new/BUILD
   moonbase/branches/crater/libs/glibc-new/BUILD.x86_64
Log:
Only cosmetic changes in BUILD.
Merged BUILD into BUILD.x86_64



Modified: moonbase/branches/crater/libs/glibc-new/BUILD
===================================================================
--- moonbase/branches/crater/libs/glibc-new/BUILD	2007-10-08 23:56:06 UTC (rev 26136)
+++ moonbase/branches/crater/libs/glibc-new/BUILD	2007-10-09 00:00:12 UTC (rev 26137)
@@ -31,6 +31,7 @@
                --enable-shared                         \
                --with-kernel=2.6.20.0                  \
                $OPTS                                  &&
+
   # explicitly exit here since the following code unsets $?
   make || exit 1 &&
 

Modified: moonbase/branches/crater/libs/glibc-new/BUILD.x86_64
===================================================================
--- moonbase/branches/crater/libs/glibc-new/BUILD.x86_64	2007-10-08 23:56:06 UTC (rev 26136)
+++ moonbase/branches/crater/libs/glibc-new/BUILD.x86_64	2007-10-09 00:00:12 UTC (rev 26137)
@@ -1,44 +1,13 @@
 (
 
-  if [ -n "$FORCE_THREADS" ]; then
-    if [ "$FORCE_THREADS" != "nptl" -a "$FORCE_THREADS" != "linuxthreads" ]; then
-      message "${PROBLEM_COLOR}Bad thread architecture: \"$FORCE_THREADS\", must be"
-      message "\"nptl\" or \"linuxthreads\"${DEFAULT_COLOR}"
-      exit 1
-    fi
-    if ! query "Force thread type to $FORCE_THREADS ?" n ; then
-      message "${PROBLEM_COLOR}If you don't know what you're doing, then I don't know either!"
-      message "Don't set FORCE_THREADS and try again!${DEFAULT_COLOR}"
-      exit 1
-    else
-      THREADS=$FORCE_THREADS
-    fi
-  else
-    case $(getconf GNU_LIBPTHREAD_VERSION) in
-      NPTL*)
-        THREADS=nptl
-        ;;
-      linux*)
-        THREADS=linuxthreads
-        ;;
-      *)
-    	message "${PROBLEM_COLOR}Cannot detect threading type of your glibc - this is very bad"
-	message "Please fix your glibc library before continuing.${DEFAULT_COLOR}"
-	exit 1
-    esac
-  fi
 
-  case $THREADS in
-    nptl)          OPTS="$OPTS --enable-add-ons=$THREADS --with-__thread --with-tls" ;;
-    linuxthreads)  OPTS="$OPTS --enable-add-ons=$THREADS --without-__thread" ;;
-  esac
+  # There is no other option but nptl
+  OPTS="$OPTS --enable-add-ons=nptl,libidn --with-__thread --with-tls"
 
   if [ -n "$MAKES" ] && [ "$MAKES" -gt 1 ] ; then
     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
 
   # Don't fully strip libc
@@ -51,11 +20,8 @@
   mkdir -p $INSTALL_ROOT &&
   cd $INSTALL_ROOT
 
-  if module_installed kernel-headers-2.6 ; then
-     OPTS="$OPTS --with-headers=/usr/include"
-  else
-     OPTS="$OPTS --with-headers=/usr/src/linux/include"
-  fi
+  # We want the newest available headers
+  OPTS="$OPTS --with-headers=/usr/src/linux/include"
 
   ../configure --prefix=/usr                           \
                --infodir=/usr/share/info               \
@@ -66,7 +32,9 @@
                --enable-shared                         \
                --host=$BUILD                           \
                --build=$BUILD                          \
+               --with-kernel=2.6.20.0                  \
                $OPTS                                  &&
+
   # explicitly exit here since the following code unsets $?
   make || exit 1
 
@@ -108,6 +76,7 @@
 
   # clean hack to make sure gnu/stubs.h gets refreshed
   rm -f /usr/include/gnu/stubs.h  &&
+
   # This removes the old glibc
   prepare_install                 &&