patch-configure 3.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126
  1. --- valgrind-3.5.0.orig/configure 2009-08-19 15:44:07.000000000 +0200
  2. +++ valgrind-3.5.0/configure 2011-01-21 23:59:05.014913852 +0100
  3. @@ -1819,7 +1819,6 @@ fi
  4. #----------------------------------------------------------------------------
  5. # Checks for various programs.
  6. #----------------------------------------------------------------------------
  7. -CFLAGS="-Wno-long-long"
  8. echo "$as_me:$LINENO: checking whether ln -s works" >&5
  9. echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
  10. @@ -2429,7 +2428,6 @@ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&
  11. GCC=`test $ac_compiler_gnu = yes && echo yes`
  12. ac_test_CFLAGS=${CFLAGS+set}
  13. ac_save_CFLAGS=$CFLAGS
  14. -CFLAGS="-g"
  15. echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
  16. echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
  17. if test "${ac_cv_prog_cc_g+set}" = set; then
  18. @@ -2481,23 +2479,6 @@ ac_cv_prog_cc_g=no
  19. fi
  20. rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  21. fi
  22. -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
  23. -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
  24. -if test "$ac_test_CFLAGS" = set; then
  25. - CFLAGS=$ac_save_CFLAGS
  26. -elif test $ac_cv_prog_cc_g = yes; then
  27. - if test "$GCC" = yes; then
  28. - CFLAGS="-g -O2"
  29. - else
  30. - CFLAGS="-g"
  31. - fi
  32. -else
  33. - if test "$GCC" = yes; then
  34. - CFLAGS="-O2"
  35. - else
  36. - CFLAGS=
  37. - fi
  38. -fi
  39. echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
  40. echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
  41. if test "${ac_cv_prog_cc_stdc+set}" = set; then
  42. @@ -4215,7 +4196,7 @@ echo "${ECHO_T}ok (${host_os})" >&6
  43. echo "$as_me:$LINENO: checking for the kernel version" >&5
  44. echo $ECHO_N "checking for the kernel version... $ECHO_C" >&6
  45. - kernel=`uname -r`
  46. + kernel=2.6.33
  47. case "${kernel}" in
  48. 2.6.*)
  49. @@ -4841,6 +4822,27 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
  50. fi
  51. rm -f conftest*
  52. +cat >conftest.$ac_ext <<_ACEOF
  53. +/* confdefs.h. */
  54. +_ACEOF
  55. +cat confdefs.h >>conftest.$ac_ext
  56. +cat >>conftest.$ac_ext <<_ACEOF
  57. +/* end confdefs.h. */
  58. +
  59. +#include <features.h>
  60. +#ifdef __GNU_LIBRARY__
  61. + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 12)
  62. + GLIBC_212
  63. + #endif
  64. +#endif
  65. +
  66. +_ACEOF
  67. +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  68. + $EGREP "GLIBC_212" >/dev/null 2>&1; then
  69. + libc="2.12"
  70. +fi
  71. +rm -f conftest*
  72. +
  73. cat >conftest.$ac_ext <<_ACEOF
  74. /* confdefs.h. */
  75. @@ -5005,15 +5007,15 @@ cat >>conftest.$ac_ext <<_ACEOF
  76. #include <features.h>
  77. #ifdef __GNU_LIBRARY__
  78. - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 10)
  79. - GLIBC_210
  80. + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 12)
  81. + GLIBC_212
  82. #endif
  83. #endif
  84. _ACEOF
  85. if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  86. - $EGREP "GLIBC_210" >/dev/null 2>&1; then
  87. - GLIBC_VERSION="2.10"
  88. + $EGREP "GLIBC_212" >/dev/null 2>&1; then
  89. + GLIBC_VERSION="2.12"
  90. fi
  91. rm -f conftest*
  92. @@ -5174,6 +5176,17 @@ _ACEOF
  93. DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
  94. DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
  95. ;;
  96. + 2.12*)
  97. + echo "$as_me:$LINENO: result: 2.12 family" >&5
  98. +echo "${ECHO_T}2.12 family" >&6
  99. +
  100. +cat >>confdefs.h <<\_ACEOF
  101. +#define GLIBC_2_12 1
  102. +_ACEOF
  103. +
  104. + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
  105. + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
  106. + ;;
  107. aix5)
  108. echo "$as_me:$LINENO: result: AIX 5.1 or 5.2 or 5.3" >&5
  109. echo "${ECHO_T}AIX 5.1 or 5.2 or 5.3" >&6
  110. @@ -5198,7 +5211,7 @@ _ACEOF
  111. *)
  112. echo "$as_me:$LINENO: result: unsupported version" >&5
  113. echo "${ECHO_T}unsupported version" >&6
  114. - { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.10" >&5
  115. + { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.11.1" >&5
  116. echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.10" >&2;}
  117. { (exit 1); exit 1; }; }
  118. { { echo "$as_me:$LINENO: error: or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" >&5