diff options
author | George Sherwood | 2011-03-13 15:14:30 -0500 |
---|---|---|
committer | George Sherwood | 2011-03-13 15:14:30 -0500 |
commit | 8df9e1615897f4756ca2f898f682eef1db14a1ce (patch) | |
tree | 5eec2f860e19252c4b0975461da52733cdae8599 | |
parent | faa6254cabbb3aee89c026d158be76ed288e12b5 (diff) |
Revert "glibc 2.13"
Seems to be some issues. If they are resolved I can cherry-pick
it back. More likely wait until stable-0.55.
This reverts commit c7cd2e1a91cea80cffb1896fbff5e0e3de8467e2.
-rwxr-xr-x | libs/glibc/DETAILS | 6 | ||||
-rw-r--r-- | libs/glibc/HISTORY | 4 | ||||
-rwxr-xr-x | libs/glibc/PRE_BUILD | 6 | ||||
-rw-r--r-- | libs/glibc/test-installation.pl.patch | 4 |
4 files changed, 5 insertions, 15 deletions
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS index 1d6a1b36a7..f881333e66 100755 --- a/libs/glibc/DETAILS +++ b/libs/glibc/DETAILS @@ -22,7 +22,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION else if [[ "$GLIBC_CVS" == "y" ]]; then local GLIBC_VERSION - GLIBC_VERSION=2.13 + GLIBC_VERSION=2.12.2 if [[ "${GLIBC_CVS_AUTOUPDATE}" == "y" ]]; then VERSION=${GLIBC_VERSION}-$(date +%Y%m%d) && FORCE_DOWNLOAD=on else @@ -33,7 +33,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${GLIBC_VERSION} SOURCE_URL=cvs://:pserver:anoncvs:anoncvs@sources.redhat.com:/cvs/glibc:libc:$SPELL-${GLIBC_VERSION/./_}-branch SOURCE_IGNORE=volatile else - VERSION=2.13 + VERSION=2.12.2 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE2=$SOURCE.sig @@ -45,7 +45,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION PATCHLEVEL=0 fi if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then - HEADERS_VERSION=2.6.37 + HEADERS_VERSION=2.6.36 SOURCE3=linux-${HEADERS_VERSION}.tar.bz2 SOURCE6=${SOURCE3}.sign SOURCE6_IGNORE=signature diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY index 8a72bd1096..52b096decd 100644 --- a/libs/glibc/HISTORY +++ b/libs/glibc/HISTORY @@ -1,7 +1,3 @@ -2011-02-03 Ladislav Hagara <hgr@vabo.cz> - * DETAILS: 2.13, HEADERS_VERSION=2.6.37 - * PRE_BUILD, test-installation.pl.patch: added patch - 2010-12-14 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.12.2, HEADERS_VERSION=2.6.36 * PRE_BUILD, glibc-2.12.1-never-expand-origin-when-privileged.patch, diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD index 3ff8bad2e9..8d99f5d3fe 100755 --- a/libs/glibc/PRE_BUILD +++ b/libs/glibc/PRE_BUILD @@ -82,8 +82,6 @@ mk_source_dir $SOURCE_DIRECTORY.bld && local test_path=$SOURCE_DIRECTORY.bld/test-installation && mkdir $test_path && sed -i "s,/tmp,$test_path,g" scripts/test-installation.pl && -sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile && +sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile + -# CC="gcc" /usr/bin/perl scripts/test-installation.pl /usr/src/glibc-2.13.bld/ -# /usr/lib/gcc/i686-pc-linux-gnu/4.4.3/../../../../i686-pc-linux-gnu/bin/ld: cannot find -lnss_test1 -patch scripts/test-installation.pl < $SPELL_DIRECTORY/test-installation.pl.patch diff --git a/libs/glibc/test-installation.pl.patch b/libs/glibc/test-installation.pl.patch deleted file mode 100644 index cc5a89184e..0000000000 --- a/libs/glibc/test-installation.pl.patch +++ /dev/null @@ -1,4 +0,0 @@ -108c108 -< if ($name ne "nss_ldap" && $name ne "db1" ---- -> if ($name ne "nss_ldap" && $name ne "db1" && $name ne "nss_test1" |