diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-02-27 20:52:30 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-02-27 20:52:30 +0000 |
| commit | abd923dbf2d828612e00a07d47365040b5218d33 (patch) | |
| tree | da06392c974fa456f161e66baebe3ace599e82b6 /sysdeps/unix | |
| parent | 6664049b71f562ffbf77f96cf6a7521aa6135ed2 (diff) | |
| download | glibc-abd923dbf2d828612e00a07d47365040b5218d33.tar.gz glibc-abd923dbf2d828612e00a07d47365040b5218d33.tar.xz glibc-abd923dbf2d828612e00a07d47365040b5218d33.zip | |
Require Linux kernel headers from "make headers_install", >= 2.6.19.1.
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure | 18 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure.in | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index c5fd66b778..33821c0bb6 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -242,33 +242,33 @@ $as_echo "$ac_cv_path_EGREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking installed Linux kernel header files" >&5 $as_echo_n "checking installed Linux kernel header files... " >&6; } -if ${libc_cv_linux2010+:} false; then : +if ${libc_cv_linux2619+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <linux/version.h> -#if !defined LINUX_VERSION_CODE || LINUX_VERSION_CODE < (2 *65536+ 0 *256+ 10) /* 2.0.10 */ +#if !defined LINUX_VERSION_CODE || LINUX_VERSION_CODE < (2 *65536+ 6 *256+ 19) /* 2.6.19 */ eat flaming death #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "eat flaming death" >/dev/null 2>&1; then : - libc_cv_linux2010='TOO OLD!' + libc_cv_linux2619='TOO OLD!' else - libc_cv_linux2010='2.0.10 or later' + libc_cv_linux2619='2.6.19 or later' fi rm -f conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_linux2010" >&5 -$as_echo "$libc_cv_linux2010" >&6; } -if test "$libc_cv_linux2010" != '2.0.10 or later'; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_linux2619" >&5 +$as_echo "$libc_cv_linux2619" >&6; } +if test "$libc_cv_linux2619" != '2.6.19 or later'; then as_fn_error $? "GNU libc requires kernel header files from -Linux 2.0.10 or later to be installed before configuring. +Linux 2.6.19 or later to be installed before configuring. The kernel header files are found usually in /usr/include/asm and /usr/include/linux; make sure these directories use files from -Linux 2.0.10 or later. This check uses <linux/version.h>, so +Linux 2.6.19 or later. This check uses <linux/version.h>, so make sure that file was built correctly when installing the kernel header files. To use kernel headers not from /usr/include/linux, use the configure option --with-headers." "$LINENO" 5 diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in index a73c3e51e1..59a13112b2 100644 --- a/sysdeps/unix/sysv/linux/configure.in +++ b/sysdeps/unix/sysv/linux/configure.in @@ -5,7 +5,7 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. # existing system library, because we are the only system library. inhibit_glue=yes -define([LIBC_LINUX_VERSION],[2.0.10])dnl +define([LIBC_LINUX_VERSION],[2.6.19])dnl if test -n "$sysheaders"; then OLD_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $SYSINCLUDES" |