[Lunar-commits] <moonbase> glibc: something newer !
Samuel Verstraete
elangelo at lunar-linux.org
Wed Dec 2 20:05:36 CET 2009
commit 15e35787f0c34c57ea8453c383823549684eafca
Author: Samuel Verstraete <elangelo at lunar-linux.org>
Date: Wed Aug 5 14:50:12 2009 +0200
glibc: something newer !
---
libs/glibc/BUILD | 117 ++++++++++++++++++++++----------------------
libs/glibc/BUILD.x86_64 | 123 ++++++++++++++++++++++++-----------------------
libs/glibc/CONFIGURE | 8 ++--
libs/glibc/DETAILS | 24 +++++-----
libs/glibc/PRE_BUILD | 6 +-
5 files changed, 139 insertions(+), 139 deletions(-)
diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 24f09d7..492fff8 100644
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -1,72 +1,71 @@
(
-
+
# This sedit takes care of Bug Report 398 submitted by Striker.
sedit "s:/tmp:$SOURCE_DIRECTORY/tmp:g" scripts/test-installation.pl &&
mkdir -p $SOURCE_DIRECTORY/tmp &&
-
+
# There is no other option but nptl
- OPTS="$OPTS --enable-add-ons=nptl,libidn --with-__thread --with-tls"
-
+ 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
-
- export CC=gcc
-
+ fi &&
+
+ export CC=gcc &&
+
# Don't fully strip libc
if [[ "$LDFLAGS" == *-s* ]] ; then
STRIP=y
- fi
- unset LDFLAGS
-
+ fi &&
+ unset LDFLAGS &&
+
patch_it $SOURCE3 1 &&
-
+
INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot &&
mkdir -p $INSTALL_ROOT &&
- cd $INSTALL_ROOT
-
- OPTS="$OPTS --with-headers=/usr/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.23 \
- $OPTS &&
-
+ cd $INSTALL_ROOT &&
+
+ OPTS+=" --with-headers=/usr/include" &&
+
+ ../configure --prefix=/usr \
+ --infodir=/usr/share/info \
+ --mandir=/usr/share/man \
+ --with-elf \
+ --with-gd=no \
+ --without-cvs \
+ --enable-shared \
+ $OPTS &&
+
# explicitly exit here since the following code unsets $?
make || exit 1 &&
-
+
# Preserve the old glibc temporarily
- LD=/lib/ld-linux.so.2
- GLIBC=/lib/libc.so.6
- DL=/lib/libdl.so.2
- M=/lib/libm.so.6
- RT=/lib/librt.so.1
- PTHREAD=/lib/libpthread.so.0
- NSS=/lib/libnss_files.so.2
- UTIL=/lib/libutil.so.1
- NSL=/lib/libnsl.so.1
- CRYPT=/lib/libcrypt.so.1
-
+ LD=/lib/ld-linux.so.2 &&
+ GLIBC=/lib/libc.so.6 &&
+ DL=/lib/libdl.so.2 &&
+ M=/lib/libm.so.6 &&
+ RT=/lib/librt.so.1 &&
+ PTHREAD=/lib/libpthread.so.0 &&
+ NSS=/lib/libnss_files.so.2 &&
+ 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
- DL=/lib/libdl.so.2.1
+ GLIBC=/lib/libc.so.6.1 &&
+ DL=/lib/libdl.so.2.1 &&
M=/lib/libm.so.6.1
;;
ppc)
- LD=/lib/ld.so.1
+ LD=/lib/ld.so.1 &&
DL=/lib/libdl.so.2
;;
*)
DL=/lib/libdl.so.2
;;
- esac
-
+ esac &&
+
cp $LD /lib/ld-lunar.so &&
cp $GLIBC /lib/libc-lunar.so &&
cp $DL /lib/libdl-lunar.so &&
@@ -77,7 +76,7 @@
cp $UTIL /lib/libutil-lunar.so &&
cp $NSL /lib/libnsl-lunar.so &&
cp $CRYPT /lib/libcrypt-lunar.so &&
-
+
# Setup links for libraries
sln /lib/ld-lunar.so $LD &&
sln /lib/libc-lunar.so $GLIBC &&
@@ -89,16 +88,16 @@
sln /lib/libutil-lunar.so $UTIL &&
sln /lib/libnsl-lunar.so $NSL &&
sln /lib/libcrypt-lunar.so $CRYPT &&
-
+
# clean hack to make sure gnu/stubs.h gets refreshed
rm -f /usr/include/gnu/stubs.h &&
-
+
# This removes the old glibc
prepare_install &&
-
+
# And now we install the new
make install &&
-
+
# Now optionally perform debug symbol stripping only
if [ "$STRIP" == "y" ] ; then
for FN in ld-$VERSION.so \
@@ -106,37 +105,37 @@
libnss_{compat,files,hesiod,nis,nisplus}-$VERSION.so \
lib{memusage,pcprofile,SegFault,thread_db-1.0}.so ; do
strip -S /lib/$FN
- done
+ done &&
for FN in "/usr/lib/gconv/*.so" ; do
strip -S $FN
done
fi &&
-
+
# Added a symlink for ash and others
ln -sf /usr/lib/libbsd-compat.a /usr/lib/libbsd.a &&
-
+
# Rebuild the ld cache
rm -f /etc/ld.so.cache 2>/dev/null &&
ldconfig &&
-
+
# Remove the temporary libc
rm /lib/{ld,lib{c,dl,m,rt,pthread,nss_files,util,nsl,crypt}}-lunar.so &&
-
+
# Generate locale info
if [ -z "$GLIBC_LOCALES" ]; then
make localedata/install-locales || exit 1
else
devoke_installwatch &&
for LOCALE in $GLIBC_LOCALES; do
- INPUTFILE=$(echo $LOCALE | cut -d/ -f1 | sed -e 's:\..*$::g')
- OUTPUTFILE=$(echo $LOCALE | cut -d/ -f1)
- CHARMAP=$(echo $LOCALE | cut -d/ -f2)
- mkdir -p /usr/lib/locale/$OUTPUTFILE
- echo "localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE"
+ INPUTFILE=$(echo $LOCALE | cut -d/ -f1 | sed -e 's:\..*$::g') &&
+ OUTPUTFILE=$(echo $LOCALE | cut -d/ -f1) &&
+ CHARMAP=$(echo $LOCALE | cut -d/ -f2) &&
+ mkdir -p /usr/lib/locale/$OUTPUTFILE &&
+ echo "localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE" &&
localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE
done
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 c61b76c..6720b9e 100644
--- a/libs/glibc/BUILD.x86_64
+++ b/libs/glibc/BUILD.x86_64
@@ -1,60 +1,61 @@
(
-
+
# This sedit takes care of Bug Report 398 submitted by Striker.
sedit "s:/tmp:$SOURCE_DIRECTORY/tmp:g" scripts/test-installation.pl &&
mkdir -p $SOURCE_DIRECTORY/tmp &&
-
+
# There is no other option but nptl
- OPTS="$OPTS --enable-add-ons=nptl,libidn --with-__thread --with-tls"
-
+ 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
-
- export CC=gcc
-
+ fi &&
+
+ export CC=gcc &&
+
# Don't fully strip libc
if [[ "$LDFLAGS" == *-s* ]] ; then
STRIP=y
- fi
- unset LDFLAGS
-
+ fi &&
+ unset LDFLAGS &&
+
patch_it $SOURCE3 1 &&
-
+
INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot &&
mkdir -p $INSTALL_ROOT &&
- cd $INSTALL_ROOT
-
- OPTS="$OPTS --with-headers=/usr/include"
-
- ../configure --prefix=/usr \
- --infodir=/usr/share/info \
- --mandir=/usr/share/man \
- --with-elf \
- --with-gd=no \
- --without-cvs \
- --enable-shared \
- --host=$BUILD \
- --build=$BUILD \
- --with-kernel=2.6.23 \
- $OPTS &&
-
+ cd $INSTALL_ROOT &&
+
+ OPTS+=" --with-headers=/usr/include" &&
+
+ ../configure --prefix=/usr \
+ --infodir=/usr/share/info \
+ --mandir=/usr/share/man \
+ --with-elf \
+ --with-gd=no \
+ --without-cvs \
+ --enable-shared \
+ --host=$BUILD \
+ --build=$BUILD \
+ $OPTS &&
+
# explicitly exit here since the following code unsets $?
- make || exit 1
-
+ make || exit 1 &&
+
# Preserve the old glibc temporarily
- LD=/lib/ld-linux-x86-64.so.2
- GLIBC=/lib/libc.so.6
- DL=/lib/libdl.so.2
- M=/lib/libm.so.6
- RT=/lib/librt.so.1
- PTHREAD=/lib/libpthread.so.0
- NSS=/lib/libnss_files.so.2
- UTIL=/lib/libutil.so.1
- NSL=/lib/libnsl.so.1
- CRYPT=/lib/libcrypt.so.1
- DL=/lib/libdl.so.2
-
+ LD=/lib/ld-linux.so.2 &&
+ LD=/lib/ld-linux-x86-64.so.2 &&
+ GLIBC=/lib/libc.so.6 &&
+ DL=/lib/libdl.so.2 &&
+ M=/lib/libm.so.6 &&
+ RT=/lib/librt.so.1 &&
+ PTHREAD=/lib/libpthread.so.0 &&
+ NSS=/lib/libnss_files.so.2 &&
+ UTIL=/lib/libutil.so.1 &&
+ NSL=/lib/libnsl.so.1 &&
+ CRYPT=/lib/libcrypt.so.1 &&
+
+ DL=/lib/libdl.so.2 &&
+
cp $LD /lib/ld-lunar.so &&
cp $GLIBC /lib/libc-lunar.so &&
cp $DL /lib/libdl-lunar.so &&
@@ -65,7 +66,7 @@
cp $UTIL /lib/libutil-lunar.so &&
cp $NSL /lib/libnsl-lunar.so &&
cp $CRYPT /lib/libcrypt-lunar.so &&
-
+
# Setup links for libraries
sln /lib/ld-lunar.so $LD &&
sln /lib/libc-lunar.so $GLIBC &&
@@ -77,16 +78,16 @@
sln /lib/libutil-lunar.so $UTIL &&
sln /lib/libnsl-lunar.so $NSL &&
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
for FN in ld-$VERSION.so \
@@ -94,37 +95,37 @@
libnss_{compat,files,hesiod,nis,nisplus}-$VERSION.so \
lib{memusage,pcprofile,SegFault,thread_db-1.0}.so ; do
strip -S /lib/$FN
- done
+ done &&
for FN in "/usr/lib/gconv/*.so" ; do
strip -S $FN
done
fi &&
-
+
# Added a symlink for ash and others
ln -sf /usr/lib/libbsd-compat.a /usr/lib/libbsd.a &&
-
+
# Rebuild the ld cache
rm -f /etc/ld.so.cache 2>/dev/null &&
ldconfig &&
-
+
# Remove the temporary libc
rm /lib/{ld,lib{c,dl,m,rt,pthread,nss_files,util,nsl,crypt}}-lunar.so &&
-
+
# Generate locale info
if [ -z "$GLIBC_LOCALES" ]; then
make localedata/install-locales || exit 1
else
devoke_installwatch &&
for LOCALE in $GLIBC_LOCALES; do
- INPUTFILE=$(echo $LOCALE | cut -d/ -f1 | sed -e 's:\..*$::g')
- OUTPUTFILE=$(echo $LOCALE | cut -d/ -f1)
- CHARMAP=$(echo $LOCALE | cut -d/ -f2)
- mkdir -p /usr/lib/locale/$OUTPUTFILE
- echo "localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE"
+ INPUTFILE=$(echo $LOCALE | cut -d/ -f1 | sed -e 's:\..*$::g') &&
+ OUTPUTFILE=$(echo $LOCALE | cut -d/ -f1) &&
+ CHARMAP=$(echo $LOCALE | cut -d/ -f2) &&
+ mkdir -p /usr/lib/locale/$OUTPUTFILE &&
+ echo "localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE" &&
localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE
done
invoke_installwatch &&
touch /usr/lib/locale/locale-archive
fi
-
+
) > $C_FIFO 2>&1 && ldconfig
diff --git a/libs/glibc/CONFIGURE b/libs/glibc/CONFIGURE
index 9c9ee7f..f871d4c 100644
--- a/libs/glibc/CONFIGURE
+++ b/libs/glibc/CONFIGURE
@@ -14,9 +14,9 @@ unpack_localedata() {
message "Extracting locale data .. this might take a second .."
# Extract the localedata directory from the source tarball
- tar -C /tmp \
- -T $FILELIST_FILE \
- --strip-components=1 \
+ tar -C /tmp \
+ -T $FILELIST_FILE \
+ --strip-components=1 \
-xjf $SOURCE_CACHE/$SOURCE
}
@@ -58,7 +58,7 @@ select_locales() {
BACKTITLE="Glibc Configuration"
TITLE="Locale Selection"
HELP="Translated messages are automatically installed, but the locale database that controls other behavior is not. Please select desired locale or locales. If none are selected then all will be installed."
- make_locales_checklist | xargs \
+ make_locales_checklist | xargs \
dialog --backtitle "$BACKTITLE" \
--title "$TITLE" \
--stdout \
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index caa7873..164a9ea 100644
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -1,20 +1,20 @@
MODULE=glibc
- VERSION=2.7
- SOURCE=$MODULE-$VERSION.tar.bz2
+ VERSION=2.10.1
+ SOURCE=$MODULE-$VERSION.tar.gz
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=$MODULE-$VERSION-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
+ SOURCE_VFY=sha1:e185b1faa54b734f9baba815142e9abf6c02054b
+ SOURCE2_VFY=sha1:50c1ac0d9ddff6eb83f75aa1c4cb84ba6fffa0cd
+ SOURCE3_VFY=sha1:9163df279f04efcc37a146115534e9fd0f9a19c5
WEB_SITE=http://www.gnu.org/software/libc
ENTERED=20010922
- UPDATED=20071211
- SHORT="C library for use with GNU/Hurd and GNU/Linux."
+ UPDATED=20090518
+ SHORT="C library for use with GNU/Hurd and GNU/Linux"
PSAFE=no
cat << EOF
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index c418228..1daa4b3 100644
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -1,4 +1,4 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-unpack $SOURCE2 &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+unpack $SOURCE2 &&
mv glibc-libidn-$VERSION libidn
More information about the Lunar-commits
mailing list