[Glibc-bsd-commits] r2567 - trunk/glibc-ports/kfreebsd

[Aurelien Jarno]

Author: aurel32
Date: 2009-06-02 18:30:28 +0000 (Tue, 02 Jun 2009)
New Revision: 2567

Modified:
   trunk/glibc-ports/kfreebsd/configure
   trunk/glibc-ports/kfreebsd/configure.in
Log:
Fix kernel version test



Modified: trunk/glibc-ports/kfreebsd/configure
===================================================================
--- trunk/glibc-ports/kfreebsd/configure	2009-06-02 17:08:50 UTC (rev 2566)
+++ trunk/glibc-ports/kfreebsd/configure	2009-06-02 18:30:28 UTC (rev 2567)
@@ -59,7 +59,7 @@
 #if !defined(__FreeBSD_kernel_version) && defined(__FreeBSD_version)
 #define __FreeBSD_kernel_version __FreeBSD_version
 #endif
-#if !defined __FreeBSD_kernel_version || __FreeBSD_kernel_version <  (6 *65536+ 4 *256+ 0) /* 6.0.0 */
+#if !defined __FreeBSD_kernel_version || __FreeBSD_kernel_version <  (6 *100000+ 0 *1000+ 0) /* 6.0.0 */
 eat flaming death
 #endif
 _ACEOF
@@ -146,6 +146,7 @@
 if test -n "$minimum_kernel"; then
   echo "$as_me:$LINENO: checking for kernel header at least $minimum_kernel" >&5
 echo $ECHO_N "checking for kernel header at least $minimum_kernel... $ECHO_C" >&6
+  hdrnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 100000 + \2 * 1000 + \3)/'`;
   decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`;
   abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`;
   cat >conftest.$ac_ext <<_ACEOF
@@ -158,7 +159,7 @@
 #if !defined(__FreeBSD_kernel_version) && defined(__FreeBSD_version)
 #define __FreeBSD_kernel_version __FreeBSD_version
 #endif
-#if __FreeBSD_kernel_version < $decnum
+#if __FreeBSD_kernel_version < $hdrnum
 eat flaming death
 #endif
 _ACEOF

Modified: trunk/glibc-ports/kfreebsd/configure.in
===================================================================
--- trunk/glibc-ports/kfreebsd/configure.in	2009-06-02 17:08:50 UTC (rev 2566)
+++ trunk/glibc-ports/kfreebsd/configure.in	2009-06-02 18:30:28 UTC (rev 2567)
@@ -38,7 +38,7 @@
 #endif
 #if !defined __FreeBSD_kernel_version || __FreeBSD_kernel_version < ]dnl
 patsubst(LIBC_KFREEBSD_VERSION,[^\([^.]*\)\.\([^.]*\)\.\([^.]*\)$],dnl
-[ (\1 *65536+ \2 *256+ \3) /* \1.\2.\3 */])[
+[ (\1 *100000+ \2 *1000+ \3) /* \1.\2.\3 */])[
 eat flaming death
 #endif],
 	     libc_cv_kfreebsdVER='TOO OLD!',
@@ -102,6 +102,7 @@
 if test -n "$minimum_kernel"; then
   AC_MSG_CHECKING(for kernel header at least $minimum_kernel)
 changequote(,)dnl
+  hdrnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 100000 + \2 * 1000 + \3)/'`;
   decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`;
   abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`;
 changequote([,])dnl
@@ -109,7 +110,7 @@
 #if !defined(__FreeBSD_kernel_version) && defined(__FreeBSD_version)
 #define __FreeBSD_kernel_version __FreeBSD_version
 #endif
-#if __FreeBSD_kernel_version < $decnum
+#if __FreeBSD_kernel_version < $hdrnum
 eat flaming death
 #endif], libc_minimum_kernel='too old!', libc_minimum_kernel=ok)
   AC_MSG_RESULT($libc_minimum_kernel)