[Lunar-commits] CVS: crater/libs/glibc BUILD.sparc64, NONE,
1.1 POST_INSTALL, NONE, 1.1 BUILD, 1.6, 1.7 DETAILS, 1.4, 1.5
Terry Chan
tchan at lunar-linux.org
Wed Aug 4 04:01:59 GMT 2004
Update of /var/cvs/lunar/crater/libs/glibc
In directory dbguin.lunar-linux.org:/tmp/cvs-serv14596
Modified Files:
BUILD DETAILS
Added Files:
BUILD.sparc64 POST_INSTALL
Log Message:
Version bump to glibc-2.3.3. Tested on 3 lunar boxes here with no problems.
Getting ready for a move to glibc-2.3.3, sometime soon....
--- NEW FILE: BUILD.sparc64 ---
(
#Patch stuff
# patch_it $SOURCE_CACHE/$SOURCE3 1 # Via c3
# patch_it $SOURCE_CACHE/$SOURCE4 1 # old static-bin segfault
# patch_it $SOURCE_CACHE/$SOURCE5 1 # gcc 3.3 glibc patch
# patch_it $SOURCE_CACHE/$SOURCE6 1 # initgroups fault patch
if [ -n "$MAKES" ] && [ "$MAKES" -gt 1 ] ; then
sedit "s/# PARALLELMFLAGS = -j 4/PARALLELMFLAGS = -j $MAKES/" Makefile.in
fi
# Correct the asm symlink in kernel source, otherwise glibc will NOT build correctly
cd /usr/src/linux/include && rm asm &&
ln -sf asm-sparc asm &&
# Don't allow too much damage
unset CFLAGS CXXFLAGS CPPFLAGS LD_LIBRARY_PATH
export CC=gcc
# Don't fully strip libc
if [[ "$LDFLAGS" == *-s* ]] ; then
STRIP=y
fi
unset LDFLAGS
INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot &&
mkdir -p $INSTALL_ROOT &&
cd $INSTALL_ROOT
../configure --host=$BUILD \
--build=$BUILD \
--enable-add-ons=linuxthreads \
--with-elf \
--with-headers=/usr/src/linux/include \
--with-gd=no \
--without-cvs \
--enable-shared \
--infodir=/usr/share/info \
--mandir=/usr/share/man \
--prefix=/usr \
$OPTS &&
make &&
# 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
cp $LD /lib/ld-lunar.so &&
cp $GLIBC /lib/libc-lunar.so &&
cp $DL /lib/libdl-lunar.so &&
cp $M /lib/libm-lunar.so &&
cp $RT /lib/librt-lunar.so &&
cp $PTHREAD /lib/libpthread-lunar.so &&
cp $NSS /lib/libnss_files-lunar.so &&
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 &&
sln /lib/libdl-lunar.so $DL &&
sln /lib/libm-lunar.so $M &&
sln /lib/librt-lunar.so $RT &&
sln /lib/libpthread-lunar.so $PTHREAD &&
sln /lib/libnss_files-lunar.so $NSS &&
sln /lib/libutil-lunar.so $UTIL &&
sln /lib/libnsl-lunar.so $NSL &&
sln /lib/libcrypt-lunar.so $CRYPT &&
# This removes the old glibc
prepare_install &&
# And now we install the new
make install &&
# Make kernel header files for kernel-headers module
cd /usr/src/linux/include &&
HDRS_VER="$(uname -s)-$(uname -r | sed 's/[-a-z].*//')-sparc" &&
if [ ! -e /var/spool/lunar/kernel-headers-"$HDRS_VER".tar.bz2 ] ; then
touch /tmp/lunar-kernel-header-install &&
tar -cjf /var/spool/lunar/kernel-headers-"$HDRS_VER".tar.bz2 linux
fi &&
if [ ! -e /var/spool/lunar/asm-headers-"$HDRS_VER".tar.bz2 ] ; then
touch /tmp/lunar-kernel-header-install &&
tar -cjf /var/spool/lunar/asm-headers-"$HDRS_VER".tar.bz2 asm/*
fi &&
# restore the kernel symlink for the asm dir back to sparc64 now
rm asm && ln -sf asm-sparc64 asm &&
cd $INSTALL_ROOT
# Now optionally perform debug symbol stripping only
if [ "$STRIP" == "y" ] ; then
for FN in ld-2.3.3.so libanl-2.3.3.so libBrokenLocale-2.3.3.so libc-2.3.3.so \
libcrypt-2.3.3.so libdl-2.3.3.so libm-2.3.3.so libmemusage.so \
libnsl-2.3.3.so libnss_compat-2.3.3.so libnss_files-2.3.3.so \
libnss_hesiod-2.3.3.so libnss_nis-2.3.3.so libnss_nisplus-2.3.3.so \
libpcprofile.so libpthread-0.10.so libresolv-2.3.3.so libSegFault.so \
libthread_db-1.0.so libutil-2.3.3.so
do
strip -S /lib/$FN
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-lunar.so &&
rm /lib/libc-lunar.so &&
rm /lib/libdl-lunar.so &&
rm /lib/libm-lunar.so &&
rm /lib/librt-lunar.so &&
rm /lib/libpthread-lunar.so &&
rm /lib/libnss_files-lunar.so &&
rm /lib/libutil-lunar.so &&
rm /lib/libnsl-lunar.so &&
rm /lib/libcrypt-lunar.so &&
# Generate locale info
unset LD_PRELOAD &&
if [ -z "$GLIBC_LOCALES" ]; then
cat $SCRIPT_DIRECTORY/locales |
while read LOCALE DESCRIPTION; do
INPUTFILE=`echo $LOCALE | cut -d / -f1`
CHARMAP=`echo $LOCALE | cut -d / -f2`
mkdir -p /usr/lib/locale/$INPUTFILE
echo "localedef -i $INPUTFILE -f $CHARMAP $INPUTFILE"
localedef -i $INPUTFILE -f $CHARMAP $INPUTFILE
done
true
else
for LOCALE in $GLIBC_LOCALES; do
INPUTFILE=`echo $LOCALE | cut -d / -f1`
CHARMAP=`echo $LOCALE | cut -d / -f2`
mkdir -p /usr/lib/locale/$INPUTFILE
echo "localedef -i $INPUTFILE -f $CHARMAP $INPUTFILE"
localedef -i $INPUTFILE -f $CHARMAP $INPUTFILE
done
true
fi
) > $C_FIFO 2>&1 && ldconfig
--- NEW FILE: POST_INSTALL ---
# Install the kernel headers which we created in BUILD
if ! module_installed kernel-headers-2.6 ; then
if [ -e /tmp/lunar-kernel-header-install ] ; then
mv /var/lock/installing.glibc /var/lock/installing.$$
lin -c kernel-headers
mv /var/lock/installing.$$ /var/lock/installing.glibc
rm -f /tmp/lunar-kernel-header-install
fi
fi
Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/libs/glibc/BUILD,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- BUILD 11 Mar 2003 16:18:29 -0000 1.6
+++ BUILD 4 Aug 2004 04:01:56 -0000 1.7
@@ -1,13 +1,15 @@
(
#Patch stuff
- patch_it $SOURCE_CACHE/$SOURCE3 1 # Via c3
- patch_it $SOURCE_CACHE/$SOURCE4 1 # old static-bin segfault
+# patch_it $SOURCE_CACHE/$SOURCE3 1 # Via c3
+# patch_it $SOURCE_CACHE/$SOURCE4 1 # old static-bin segfault
+# patch_it $SOURCE_CACHE/$SOURCE5 1 # gcc 3.3 glibc patch
+# patch_it $SOURCE_CACHE/$SOURCE6 1 # initgroups fault patch
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
+ unset CFLAGS CXXFLAGS CPPFLAGS LD_LIBRARY_PATH
export CC=gcc
# Don't fully strip libc
@@ -35,28 +37,67 @@
make &&
# Preserve the old glibc temporarily
- cp /lib/ld-linux.so.2 /lib/ld-lunar.so &&
- cp /lib/libc.so.6 /lib/libc-lunar.so &&
- cp /lib/libdl.so.2 /lib/libdl-lunar.so &&
- cp /lib/libm.so.6 /lib/libm-lunar.so &&
- cp /lib/librt.so.1 /lib/librt-lunar.so &&
- cp /lib/libpthread.so.0 /lib/libpthread-lunar.so &&
- cp /lib/libnss_files.so.2 /lib/libnss_files-lunar.so &&
- cp /lib/libutil.so.1 /lib/libutil-lunar.so &&
- cp /lib/libnsl.so.1 /lib/libnsl-lunar.so &&
- cp /lib/libcrypt.so.1 /lib/libcrypt-lunar.so &&
+case "`arch`" in
+ "alpha")
+ LD=/lib/ld-linux.so.2
+ GLIBC=/lib/libc.so.6.1
+ DL=/lib/libdl.so.2.1
+ M=/lib/libm.so.6.1
+ RT=/lib/librt.so.1
+ PTHREAD=/lib/libpthread.so.0
+ NSS=/lib/libnss_files.so.2
+ UTIL=/lib/libutil.so.1.1
+ NSL=/lib/libnsl.so.1.1
+ CRYPT=/lib/libcrypt.so.1.1
+ ;;
+ ppc)
+ LD=/lib/ld.so.1
+ 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
+ ;;
+esac
+
+ cp $LD /lib/ld-lunar.so &&
+ cp $GLIBC /lib/libc-lunar.so &&
+ cp $DL /lib/libdl-lunar.so &&
+ cp $M /lib/libm-lunar.so &&
+ cp $RT /lib/librt-lunar.so &&
+ cp $PTHREAD /lib/libpthread-lunar.so &&
+ cp $NSS /lib/libnss_files-lunar.so &&
+ 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 /lib/ld-linux.so.2 &&
- sln /lib/libc-lunar.so /lib/libc.so.6 &&
- sln /lib/libdl-lunar.so /lib/libdl.so.2 &&
- sln /lib/libm-lunar.so /lib/libm.so.6 &&
- sln /lib/librt-lunar.so /lib/librt.so.1 &&
- sln /lib/libpthread-lunar.so /lib/libpthread.so.0 &&
- sln /lib/libnss_files-lunar.so /lib/libnss_files.so.2 &&
- sln /lib/libutil-lunar.so /lib/libutil.so.1 &&
- sln /lib/libnsl-lunar.so /lib/libnsl.so.1 &&
- sln /lib/libcrypt-lunar.so /lib/libcrypt.so.1 &&
+ sln /lib/ld-lunar.so $LD &&
+ sln /lib/libc-lunar.so $GLIBC &&
+ sln /lib/libdl-lunar.so $DL &&
+ sln /lib/libm-lunar.so $M &&
+ sln /lib/librt-lunar.so $RT &&
+ sln /lib/libpthread-lunar.so $PTHREAD &&
+ sln /lib/libnss_files-lunar.so $NSS &&
+ sln /lib/libutil-lunar.so $UTIL &&
+ sln /lib/libnsl-lunar.so $NSL &&
+ sln /lib/libcrypt-lunar.so $CRYPT &&
# This removes the old glibc
prepare_install &&
@@ -64,14 +105,30 @@
# And now we install the new
make install &&
+ # Make kernel header files for kernel-headers module
+
+ cd /usr/src/linux/include &&
+ HDRS_VER="$(uname -s)-$(uname -r | sed 's/[-a-z].*//')-$(uname -m | sed 's/i[3456]/i3/')" &&
+
+ if [ ! -e /var/spool/lunar/kernel-headers-"$HDRS_VER".tar.bz2 ] ; then
+ touch /tmp/lunar-kernel-header-install &&
+ tar -cjf /var/spool/lunar/kernel-headers-"$HDRS_VER".tar.bz2 linux
+ fi &&
+ if [ ! -e /var/spool/lunar/asm-headers-"$HDRS_VER".tar.bz2 ] ; then
+ touch /tmp/lunar-kernel-header-install &&
+ tar -cjf /var/spool/lunar/asm-headers-"$HDRS_VER".tar.bz2 asm/*
+ fi &&
+
+ cd $INSTALL_ROOT
+
# Now optionally perform debug symbol stripping only
if [ "$STRIP" == "y" ] ; then
- for FN in ld-2.3.2.so libanl-2.3.2.so libBrokenLocale-2.3.2.so libc-2.3.2.so \
- libcrypt-2.3.2.so libdl-2.3.2.so libm-2.3.2.so libmemusage.so \
- libnsl-2.3.2.so libnss_compat-2.3.2.so libnss_files-2.3.2.so \
- libnss_hesiod-2.3.2.so libnss_nis-2.3.2.so libnss_nisplus-2.3.2.so \
- libpcprofile.so libpthread-0.10.so libresolv-2.3.2.so libSegFault.so \
- libthread_db-1.0.so libutil-2.3.2.so
+ for FN in ld-2.3.3.so libanl-2.3.3.so libBrokenLocale-2.3.3.so libc-2.3.3.so \
+ libcrypt-2.3.3.so libdl-2.3.3.so libm-2.3.3.so libmemusage.so \
+ libnsl-2.3.3.so libnss_compat-2.3.3.so libnss_files-2.3.3.so \
+ libnss_hesiod-2.3.3.so libnss_nis-2.3.3.so libnss_nisplus-2.3.3.so \
+ libpcprofile.so libpthread-0.10.so libresolv-2.3.3.so libSegFault.so \
+ libthread_db-1.0.so libutil-2.3.3.so
do
strip -S /lib/$FN
done
Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/crater/libs/glibc/DETAILS,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- DETAILS 10 Mar 2003 16:28:50 -0000 1.4
+++ DETAILS 4 Aug 2004 04:01:56 -0000 1.5
@@ -1,26 +1,25 @@
MODULE=glibc
- VERSION=2.3.2
- #VERSION=2.3.1
+ VERSION=2.3.3
+ #VERSION=2.3.2
SOURCE=$MODULE-$VERSION.tar.bz2
SOURCE2=glibc-linuxthreads-$VERSION.tar.bz2
- SOURCE3=glibc-2.3.2-cmove.patch
- SOURCE4=glibc-2.3.2-ctype-compat.patch
+# SOURCE4=glibc-2.3.2-ctype-compat.patch
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
SOURCE_URL[0]=$GNU_URL/$MODULE/$SOURCE
SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$MODULE/$SOURCE
SOURCE2_URL[0]=$GNU_URL/$MODULE/$SOURCE2
SOURCE2_URL[1]=ftp://ftp.gnu.org/pub/gnu/$MODULE/$SOURCE2
- SOURCE3_URL[0]=$PATCH_URL/$SOURCE3
- SOURCE4_URL[0]=$PATCH_URL/$SOURCE4
+# SOURCE4_URL[0]=$PATCH_URL/$SOURCE4
+ SOURCE_VFY[0]=md5:e825807b98042f807799ccc9dd96d31b
+ SOURCE2_VFY[0]=md5:8149ea62922e75bd692bc3b92e5e766b
+# SOURCE4_VFY[0]=md5:8dbdd09eed303c18d2eba8bc967712a3
WEB_SITE=http://www.gnu.org/software/libc
- MAINTAINER=dem at lunar-linux.org
ENTERED=20010922
- UPDATED=20030310
+ UPDATED=20040803
SHORT="glibc is a C library for use with GNU/Hurd and GNU/Linux."
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
and most modern Linux distributions. It is used by almost all C programs
-and provides the most essential program interface. Version 2.1 is a
-companion to kernel 2.2.x.
+and provides the most essential program interface.
EOF
More information about the Lunar-commits
mailing list