Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #75 from Ratler/glibc-2.16

Glibc 2.16
  • Loading branch information...
commit d35adabc2fc6e2828138b48fc3533e35664a6fa4 2 parents 4d0401e + 045b95f
@Ratler Ratler authored
View
85 libs/glibc/BUILD
@@ -1,52 +1,46 @@
(
# The fortify compiler option cause the build to fail
- bad_flags -D_FORTIFY_SOURCE=2 &&
+ bad_flags -D_FORTIFY_SOURCE=2 &&
-# 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 &&
+ mkdir -p $SOURCE_DIRECTORY/tmp &&
- export CC_OPTS=( Pipe ) &&
+ export CC_OPTS=( Pipe ) &&
- if module_installed kernel-headers; then
- KVER=`installed_version kernel-headers`
- else
- KVER=`installed_version kernel-headers-2.6`
- fi &&
+ KVER=`installed_version kernel-headers` &&
# There is no other option but nptl
- OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=$KVER" &&
+ OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=$KVER" &&
if [ -n "$MAKES" ] && [ "$MAKES" -gt 1 ] ; then
sedit "s/# PARALLELMFLAGS = -j 4/PARALLELMFLAGS = -j $MAKES/" Makefile.in
- fi &&
+ fi &&
- export CC=gcc &&
+ export CC=gcc &&
# Don't fully strip libc
if [[ "$LDFLAGS" == *-s* ]] ; then
STRIP=y
- fi &&
- unset LDFLAGS &&
-
- patch_it $SOURCE2 1 &&
- patch_it $SOURCE3 1 &&
- patch_it $SOURCE4 1 &&
- patch_it $SOURCE5 1 &&
- patch_it $SOURCE6 1 &&
+ fi &&
+ unset LDFLAGS &&
- # Fixes nvidia-settings and other apps segfault http://www.nvnews.net/vbulletin/showpost.php?p=2501574
- patch_it $SOURCE7 1 &&
+ patch_it $SOURCE2 1 &&
+ patch_it $SOURCE3 1 &&
+ patch_it $SOURCE4 1 &&
+
+ # Fix res_query assertion
+ patch_it $SOURCE5 1 &&
+
+ # Fix various hangs
+ patch_it $SOURCE6 1 &&
- sedit 's/^# \(.* := rpcinfo\)/\1/p' sunrpc/Makefile &&
- sedit 's/test-netdb tst-nss-test1/test-netdb/' nss/Makefile &&
- sedit '/libnss_test1/d' shlib-versions &&
+ # disable final test
+ sed -i '/test-installation.pl/d' Makefile &&
- INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot &&
- mkdir -p $INSTALL_ROOT &&
- cd $INSTALL_ROOT &&
+ INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot &&
+ mkdir -p $INSTALL_ROOT &&
+ cd $INSTALL_ROOT &&
- OPTS+=" --with-headers=/usr/include" &&
+ OPTS+=" --with-headers=/usr/include" &&
../configure --prefix=/usr \
--infodir=/usr/share/info \
@@ -55,11 +49,14 @@
--without-gd \
--without-cvs \
--enable-shared \
+ --enable-obsolete-rpc \
--disable-multi-arch \
- $OPTS &&
+ --enable-bind-now \
+ --enable-stackguard-randomization \
+ $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 &&
@@ -86,7 +83,7 @@
*)
DL=/lib/libdl.so.2
;;
- esac &&
+ esac &&
cp $LD /lib/ld-lunar.so &&
cp $GLIBC /lib/libc-lunar.so &&
@@ -122,12 +119,12 @@
# Now optionally perform debug symbol stripping only
if [ "$STRIP" == "y" ] ; then
- for FN in ld-$VERSION.so \
- lib{anl,BrokenLocale,c,crypt,dl,m,nsl,util,pthread,resolv}-$VERSION.so \
- libnss_{compat,files,hesiod,nis,nisplus}-$VERSION.so \
+ for FN in ld-$MAJOR.so \
+ lib{anl,BrokenLocale,c,crypt,dl,m,nsl,util,pthread,resolv}-$MAJOR.so \
+ libnss_{compat,files,hesiod,nis,nisplus}-$MAJOR.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
@@ -147,16 +144,16 @@
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) &&
- 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 &&
+ invoke_installwatch &&
touch /usr/lib/locale/locale-archive
fi
View
84 libs/glibc/BUILD.x86_64
@@ -1,52 +1,49 @@
(
# The fortify compiler option cause the build to fail
- bad_flags -D_FORTIFY_SOURCE=2 &&
+ bad_flags -D_FORTIFY_SOURCE=2 &&
-# 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 &&
+ mkdir -p $SOURCE_DIRECTORY/tmp &&
- export CC_OPTS=( Pipe ) &&
+ export CC_OPTS=( Pipe ) &&
- if module_installed kernel-headers; then
- KVER=`installed_version kernel-headers`
- else
- KVER=`installed_version kernel-headers-2.6`
- fi &&
+ KVER=`installed_version kernel-headers` &&
# There is no other option but nptl
- OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=$KVER" &&
+ OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=$KVER" &&
if [ -n "$MAKES" ] && [ "$MAKES" -gt 1 ] ; then
sedit "s/# PARALLELMFLAGS = -j 4/PARALLELMFLAGS = -j $MAKES/" Makefile.in
- fi &&
+ fi &&
- export CC=gcc &&
+ export CC=gcc &&
# Don't fully strip libc
if [[ "$LDFLAGS" == *-s* ]] ; then
STRIP=y
- fi &&
- unset LDFLAGS &&
+ fi &&
+ unset LDFLAGS &&
+
+ # fix the compile for x86_64
+ sedit "s:s_floor-c s_ceil-c s_floorf-c s_ceilf-c:s_floorf-c s_ceilf-c:g" sysdeps/x86_64/fpu/multiarch/Makefile &&
- patch_it $SOURCE2 1 &&
- patch_it $SOURCE3 1 &&
- patch_it $SOURCE4 1 &&
- patch_it $SOURCE5 1 &&
- patch_it $SOURCE6 1 &&
+ patch_it $SOURCE2 1 &&
+ patch_it $SOURCE3 1 &&
+ patch_it $SOURCE4 1 &&
- # Fixes nvidia-settings and other apps segfault http://www.nvnews.net/vbulletin/showpost.php?p=2501574
- patch_it $SOURCE7 1 &&
+ # Fix res_query assertion
+ patch_it $SOURCE5 1 &&
+
+ # Fix various hangs
+ patch_it $SOURCE6 1 &&
- sedit 's/^# \(.* := rpcinfo\)/\1/p' sunrpc/Makefile &&
- sedit 's/test-netdb tst-nss-test1/test-netdb/' nss/Makefile &&
- sedit '/libnss_test1/d' shlib-versions &&
+ # disable final test
+ sed -i '/test-installation.pl/d' Makefile &&
- INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot &&
- mkdir -p $INSTALL_ROOT &&
- cd $INSTALL_ROOT &&
+ INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot &&
+ mkdir -p $INSTALL_ROOT &&
+ cd $INSTALL_ROOT &&
- OPTS+=" --with-headers=/usr/include" &&
+ OPTS+=" --with-headers=/usr/include" &&
../configure --prefix=/usr \
--infodir=/usr/share/info \
@@ -55,13 +52,16 @@
--without-gd \
--without-cvs \
--enable-shared \
+ --enable-obsolete-rpc \
--host=$BUILD \
--build=$BUILD \
--disable-multi-arch \
- $OPTS &&
+ --enable-bind-now \
+ --enable-stackguard-randomization \
+ $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 &&
@@ -111,12 +111,12 @@
# Now optionally perform debug symbol stripping only
if [ "$STRIP" == "y" ] ; then
- for FN in ld-$VERSION.so \
- lib{anl,BrokenLocale,c,crypt,dl,m,nsl,util,pthread,resolv}-$VERSION.so \
- libnss_{compat,files,hesiod,nis,nisplus}-$VERSION.so \
+ for FN in ld-$MAJOR.so \
+ lib{anl,BrokenLocale,c,crypt,dl,m,nsl,util,pthread,resolv}-$MAJOR.so \
+ libnss_{compat,files,hesiod,nis,nisplus}-$MAJOR.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
@@ -136,16 +136,16 @@
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) &&
- 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 &&
+ invoke_installwatch &&
touch /usr/lib/locale/locale-archive
fi
View
4 libs/glibc/CONFIGURE
@@ -9,7 +9,7 @@ FILELIST_FILE="$LOCALEDATA_DIR-files"
unpack_localedata() {
# Write the path of the localedata archive path into a file
- echo "${SOURCE/.tar.bz2/}/localedata" > $FILELIST_FILE &&
+ echo "${SOURCE/.tar.xz/}/localedata" > $FILELIST_FILE &&
message "Extracting locale data .. this might take a second .."
@@ -17,7 +17,7 @@ unpack_localedata() {
tar -C /tmp \
-T $FILELIST_FILE \
--strip-components=1 \
- -xjf $SOURCE_CACHE/$SOURCE
+ -xJf $SOURCE_CACHE/$SOURCE
}
remove_temporary_files() {
View
24 libs/glibc/DETAILS
@@ -1,12 +1,12 @@
MODULE=glibc
- VERSION=2.14.1
- SOURCE=$MODULE-$VERSION.tar.bz2
+ MAJOR=2.16
+ VERSION=$MAJOR.0
+ SOURCE=$MODULE-$VERSION.tar.xz
SOURCE2=$MODULE-2.11-no_timezones.patch.bz2
SOURCE3=$MODULE-2.11.1-__i686.patch.bz2
- SOURCE4=$MODULE-2.13-gcc_fix-1.patch.bz2
- SOURCE5=$MODULE-2.14.1-nss_test1.patch.bz2
- SOURCE6=$MODULE-2.14.1-rpc-restore.patch.bz2
- SOURCE7=$MODULE-2.14.1-fixes-1.patch
+ SOURCE4=$MODULE-2.15-fixes-1.patch.bz2
+ SOURCE5=$MODULE-2.15-fix-res_query-assert.patch
+ SOURCE6=$MODULE-2.15-revert-c5a0802a.patch
SOURCE_URL[0]=$GNU_URL/$MODULE
SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$MODULE
SOURCE_URL[2]=http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/glibc
@@ -15,17 +15,15 @@
SOURCE4_URL=$PATCH_URL
SOURCE5_URL=$PATCH_URL
SOURCE6_URL=$PATCH_URL
- SOURCE7_URL=http://www.linuxfromscratch.org/patches/lfs/7.0
- SOURCE_VFY=sha1:f1945eea78bb30563d33c9e6a5f6f97f374135b4
+ SOURCE_VFY=sha1:9d4fffc9c4ac93e7919e124fa38bb51dcaff5216
SOURCE2_VFY=sha1:fc5bf75815daeeef52f7558f27992e02c2cdc87d
SOURCE3_VFY=sha1:e3f36e2bb17e51e31035f2cd405d099c624d0e9e
- SOURCE4_VFY=sha1:2fa2f8b8920c5009a864cc0b0ec5fcccee4c84a5
- SOURCE5_VFY=sha1:4f22e3bd256652e21d6208666fef815021c1ecab
- SOURCE6_VFY=sha1:268509d8df9aa802747b84c4e46925fb65f30737
- SOURCE7_VFY=sha1:cc8fe170befc0a1fe56d6c18da1afc73c8c72b1b
+ SOURCE4_VFY=sha1:7e53ec5daaf29d13ff3e9a9b2450da1f93000add
+ SOURCE5_VFY=sha1:fa4f4ce87a08f40d70f4d88d1ee62cf63b644bcc
+ SOURCE6_VFY=sha1:aad4d183fc2509e87f0986802117a45772cc0a0c
WEB_SITE=http://www.gnu.org/software/libc
ENTERED=20010922
- UPDATED=20111114
+ UPDATED=20120712
SHORT="C library for use with GNU/Hurd and GNU/Linux"
PSAFE=no
Please sign in to comment.
Something went wrong with that request. Please try again.