diff options
| author | Eric Sandall | 2007-10-01 15:19:49 -0700 |
|---|---|---|
| committer | Eric Sandall | 2007-10-01 15:19:49 -0700 |
| commit | 503a5e2605d3d459efa624d6927834a4c61301cf (patch) | |
| tree | dcf83c54d3e59137306635139fd5f55f47539b27 | |
| parent | 68107c0d8f32c838c65bb20dc2ca3640c7a904c9 (diff) | |
Revert "Revert "glibc: Fix Bug #14004 (fails to find acceptable grep)""
This reverts commit 2688c2d74a815ebbd2f5d0a004285b42e6b2e4c9.
We want this fix in the stable-rc-0.14 glibc 2.4
| -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, 17 insertions, 0 deletions
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY index 2480ef0c25..905b619380 100644 --- a/libs/glibc/HISTORY +++ b/libs/glibc/HISTORY @@ -1,3 +1,9 @@ +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 7528daa904..6a435a2291 100755 --- a/libs/glibc/PRE_BUILD +++ b/libs/glibc/PRE_BUILD @@ -58,6 +58,7 @@ fi && cd $SOURCE_DIRECTORY && patch -p1 < $SCRIPT_DIRECTORY/glibcshared.patch && 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 new file mode 100644 index 0000000000..b0f299ccdb --- /dev/null +++ b/libs/glibc/as-test-x.patch @@ -0,0 +1,10 @@ +--- 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 |