patch-configure 2.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586
  1. --- valgrind-3.5.0.orig/configure 2009-08-19 15:44:07.000000000 +0200
  2. +++ valgrind-3.5.0/configure 2010-10-11 22:01:23.000000000 +0200
  3. @@ -4215,7 +4215,7 @@ echo "${ECHO_T}ok (${host_os})" >&6
  4. echo "$as_me:$LINENO: checking for the kernel version" >&5
  5. echo $ECHO_N "checking for the kernel version... $ECHO_C" >&6
  6. - kernel=`uname -r`
  7. + kernel=2.6.33
  8. case "${kernel}" in
  9. 2.6.*)
  10. @@ -4841,6 +4841,27 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
  11. fi
  12. rm -f conftest*
  13. +cat >conftest.$ac_ext <<_ACEOF
  14. +/* confdefs.h. */
  15. +_ACEOF
  16. +cat confdefs.h >>conftest.$ac_ext
  17. +cat >>conftest.$ac_ext <<_ACEOF
  18. +/* end confdefs.h. */
  19. +
  20. +#include <features.h>
  21. +#ifdef __GNU_LIBRARY__
  22. + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 12)
  23. + GLIBC_212
  24. + #endif
  25. +#endif
  26. +
  27. +_ACEOF
  28. +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  29. + $EGREP "GLIBC_212" >/dev/null 2>&1; then
  30. + libc="2.12"
  31. +fi
  32. +rm -f conftest*
  33. +
  34. cat >conftest.$ac_ext <<_ACEOF
  35. /* confdefs.h. */
  36. @@ -5005,15 +5026,15 @@ cat >>conftest.$ac_ext <<_ACEOF
  37. #include <features.h>
  38. #ifdef __GNU_LIBRARY__
  39. - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 10)
  40. - GLIBC_210
  41. + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 12)
  42. + GLIBC_212
  43. #endif
  44. #endif
  45. _ACEOF
  46. if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  47. - $EGREP "GLIBC_210" >/dev/null 2>&1; then
  48. - GLIBC_VERSION="2.10"
  49. + $EGREP "GLIBC_212" >/dev/null 2>&1; then
  50. + GLIBC_VERSION="2.12"
  51. fi
  52. rm -f conftest*
  53. @@ -5174,6 +5195,17 @@ _ACEOF
  54. DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
  55. DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
  56. ;;
  57. + 2.12*)
  58. + echo "$as_me:$LINENO: result: 2.12 family" >&5
  59. +echo "${ECHO_T}2.12 family" >&6
  60. +
  61. +cat >>confdefs.h <<\_ACEOF
  62. +#define GLIBC_2_12 1
  63. +_ACEOF
  64. +
  65. + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
  66. + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
  67. + ;;
  68. aix5)
  69. echo "$as_me:$LINENO: result: AIX 5.1 or 5.2 or 5.3" >&5
  70. echo "${ECHO_T}AIX 5.1 or 5.2 or 5.3" >&6
  71. @@ -5198,7 +5230,7 @@ _ACEOF
  72. *)
  73. echo "$as_me:$LINENO: result: unsupported version" >&5
  74. echo "${ECHO_T}unsupported version" >&6
  75. - { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.10" >&5
  76. + { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.11.1" >&5
  77. echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.10" >&2;}
  78. { (exit 1); exit 1; }; }
  79. { { echo "$as_me:$LINENO: error: or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" >&5