diff options
| author | David Brown | 2007-09-23 23:06:08 -0700 |
|---|---|---|
| committer | David Brown | 2007-09-23 23:06:08 -0700 |
| commit | c87de164eb1c24590f5803856e427cd16a11fb36 (patch) | |
| tree | 129921268a8b6c82032d7920eda1e44b23622ead | |
| parent | ed38eafa25584eb3534ee454398e2b23e7a91738 (diff) | |
Revert "glibc: Fix Bug #14004 (fails to find acceptable grep)"
This reverts commit 9adf2ef0ec74d3cca578bdd9d12a9f29556fe22b.
| -rw-r--r-- | libs/glibc/HISTORY | 6 | ||||
| -rwxr-xr-x | libs/glibc/PRE_BUILD | 1 | ||||
| -rw-r--r-- | libs/glibc/as-test-x.patch | 10 |
3 files changed, 0 insertions, 17 deletions
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY index 6eb391d738..a467a62fe1 100644 --- a/libs/glibc/HISTORY +++ b/libs/glibc/HISTORY @@ -1,9 +1,3 @@ -2007-09-20 Eric Sandall <sandalle@sourcemage.org> - * PRE_BUILD: Apply as-test-x.patch: Fixes Bug #14004 - * as-test-x.patch: Added from David Brown's devel update of glibc to 2.6.1 - in commit 199874422bbb17772cb0257187151007ab398463 - Fixes Bug #14004 - 2007-08-06 Treeve Jelbert <treeve@sourcemage.org> * BUILD: fix typo (bug #13925) diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD index 5c1b922227..d39e83ddf1 100755 --- a/libs/glibc/PRE_BUILD +++ b/libs/glibc/PRE_BUILD @@ -56,7 +56,6 @@ if [[ $GLIBC_NPTL == n ]]; then patch -p1 < $SCRIPT_DIRECTORY/glibcshared.patch fi && patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch && -patch -p1 < $SCRIPT_DIRECTORY/as-test-x.patch && # disabled libgd detection/building memusagestat for now until a better # fix has been found, bug #8277 diff --git a/libs/glibc/as-test-x.patch b/libs/glibc/as-test-x.patch deleted file mode 100644 index b0f299ccdb..0000000000 --- a/libs/glibc/as-test-x.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/sysdeps/unix/sysv/linux/configure.in 2007-09-13 17:56:51.519950207 -0700 -+++ b/sysdeps/unix/sysv/linux/configure.in 2007-09-13 17:40:35.186895935 -0700 -@@ -24,6 +24,7 @@ - CPPFLAGS="$CPPFLAGS $SYSINCLUDES" - fi - define([libc_cv_linuxVER], [libc_cv_linux]patsubst(LIBC_LINUX_VERSION,[\.]))dnl -+as_test_x="test -x" - AC_CACHE_CHECK(installed Linux kernel header files, libc_cv_linuxVER, [dnl - AC_EGREP_CPP([eat flaming death], [#include <linux/version.h> - #if !defined LINUX_VERSION_CODE || LINUX_VERSION_CODE < ]dnl |