[Lunar-commits] r26108 - moonbase/branches/crater/libs/glibc-new
Moritz Heiber
moe at lunar-linux.org
Mon Oct 8 00:07:28 CEST 2007
Author: moe
Date: 2007-10-08 00:07:28 +0200 (Mon, 08 Oct 2007)
New Revision: 26108
Modified:
moonbase/branches/crater/libs/glibc-new/BUILD
moonbase/branches/crater/libs/glibc-new/CONFIGURE
moonbase/branches/crater/libs/glibc-new/DETAILS
moonbase/branches/crater/libs/glibc-new/PRE_BUILD
Log:
Jannis' new language chooser is missing .. but apart from that its
ready. The newest glibc also doesn't come with linuxthreads anymore.
Either that or I missed them.
Modified: moonbase/branches/crater/libs/glibc-new/BUILD
===================================================================
--- moonbase/branches/crater/libs/glibc-new/BUILD 2007-10-07 19:58:34 UTC (rev 26107)
+++ moonbase/branches/crater/libs/glibc-new/BUILD 2007-10-07 22:07:28 UTC (rev 26108)
@@ -1,38 +1,8 @@
(
- 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
+ # There is no other option but nptl
+ OPTS="$OPTS --enable-add-ons=nptl,libidn --with-__thread --with-tls"
- case $THREADS in
- nptl) OPTS="$OPTS --enable-add-ons=$THREADS --with-__thread --with-tls" ;;
- linuxthreads) OPTS="$OPTS --enable-add-ons=$THREADS --without-__thread" ;;
- esac
-
if [ -n "$MAKES" ] && [ "$MAKES" -gt 1 ] ; then
sedit "s/# PARALLELMFLAGS = -j 4/PARALLELMFLAGS = -j $MAKES/" Makefile.in
fi
@@ -51,11 +21,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 \
@@ -64,9 +31,10 @@
--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
@@ -119,12 +87,16 @@
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 &&
+
+ # Run make check to be sure
+ make check || exit 1 &&
+
# 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
Modified: moonbase/branches/crater/libs/glibc-new/CONFIGURE
===================================================================
--- moonbase/branches/crater/libs/glibc-new/CONFIGURE 2007-10-07 19:58:34 UTC (rev 26107)
+++ moonbase/branches/crater/libs/glibc-new/CONFIGURE 2007-10-07 22:07:28 UTC (rev 26108)
@@ -1,17 +1,4 @@
-make_locales_checklist() {
- cat $SCRIPT_DIRECTORY/locales |
- while read -r ONE REST ; do
- echo -n "\"$ONE\" \"$REST\" \"off\" "
- done
-}
-#make_abi_checklist() {
-# cat $SCRIPT_DIRECTORY/abi |
-# while read -r ONE REST ; do
-# echo -n "\"$ONE\" \"$REST\" "
-# done
-#}
-
select_locales() {
BACKTITLE="Glibc Configuration"
TITLE="Locale Selection"
@@ -26,20 +13,6 @@
0 0 0
}
-#select_abi() {
-# BACKTITLE="Glibc Configuration"
-# TITLE="ABI Selection"
-# HELP="Select the last ABI you want to be compatible with."
-#
-# make_abi_checklist | xargs \
-# dialog --backtitle "$BACKTITLE" \
-# --title "$TITLE" \
-# --stdout \
-# --menu "$HELP" \
-# 0 0 0
-#}
-
-#check to see if already configured
if ! grep -q CONFIGURED $MODULE_CONFIG; then
if grep -q "GLIBC_LOCALES=" $MODULE_CONFIG
@@ -53,17 +26,6 @@
echo "GLIBC_LOCALES=\"$GLIBC_LOCALES\"" >> $MODULE_CONFIG
fi
-# GLIBC_ABI=2.0
-# if query "Would you like to select the oldest glibc ABI to be supported (Default 2.0)?" n ; then
-# GLIBC_ABI=`select_abi`
-# fi
-# OPTS="$OPTS --enable-oldest-abi=$GLIBC_ABI"
-
- if query "Would you like to disable building of profiling libs?" y
- then
- OPTS="$OPTS --disable-profile"
- fi
-
echo "OPTS=\"\$OPTS $OPTS\"" >> $MODULE_CONFIG
echo "CONFIGURED=y" >> $MODULE_CONFIG
fi
Modified: moonbase/branches/crater/libs/glibc-new/DETAILS
===================================================================
--- moonbase/branches/crater/libs/glibc-new/DETAILS 2007-10-07 19:58:34 UTC (rev 26107)
+++ moonbase/branches/crater/libs/glibc-new/DETAILS 2007-10-07 22:07:28 UTC (rev 26108)
@@ -1,21 +1,16 @@
MODULE=glibc
- VERSION=2.5
+ VERSION=2.6.1
SOURCE=$MODULE-$VERSION.tar.bz2
SOURCE2=$MODULE-libidn-$VERSION.tar.bz2
- SOURCE3=$MODULE-linuxthreads-$VERSION.tar.bz2
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[0]=$GNU_URL/$MODULE/
- SOURCE3_URL[1]=ftp://ftp.gnu.org/pub/gnu/$MODULE/
SOURCE_VFY=sha1:ec9a007c4875062099a4701ac9137fcdb5a71447
SOURCE2_VFY=sha1:ee7e019e01aa338e28db1eeb34abb2cb09d2f30a
- SOURCE3_VFY=sha1:eb7765e5c0a14c7475f1c8b92cbe1f625a8fd76f
WEB_SITE=http://www.gnu.org/software/libc
ENTERED=20010922
UPDATED=20070126
- PSAFE=no
SHORT="C library for use with GNU/Hurd and GNU/Linux."
cat << EOF
glibc - Library for use with GNU/Hurd and GNU/Linux.
Modified: moonbase/branches/crater/libs/glibc-new/PRE_BUILD
===================================================================
--- moonbase/branches/crater/libs/glibc-new/PRE_BUILD 2007-10-07 19:58:34 UTC (rev 26107)
+++ moonbase/branches/crater/libs/glibc-new/PRE_BUILD 2007-10-07 22:07:28 UTC (rev 26108)
@@ -1,12 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
unpack $SOURCE2 &&
-mv glibc-libidn-$VERSION libidn &&
-unpack $SOURCE3 &&
-
-# We need to do this in order to get an updated list of locales
-
-sed -e "/^#/d" \
- -e "/SUPPORTED-LOCALES=/d" \
- -e "s: \\\\::g" -e "s:/: :g" \
- localedata/SUPPORTED > SUPPORTED_LOCALES
+mv glibc-libidn-$VERSION libidn
More information about the Lunar-commits
mailing list