patch-configure 8.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302
  1. --- mysql-5.1.41.orig/configure 2009-11-04 19:37:28.000000000 +0100
  2. +++ mysql-5.1.41/configure 2009-12-25 12:18:01.000000000 +0100
  3. @@ -46976,197 +46976,14 @@ $as_echo "$as_me: error: unknown endiann
  4. esac
  5. - { $as_echo "$as_me:$LINENO: checking whether GCC atomic builtins are available" >&5
  6. -$as_echo_n "checking whether GCC atomic builtins are available... " >&6; }
  7. - # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
  8. - if test "$cross_compiling" = yes; then
  9. - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  10. -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  11. -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
  12. -See \`config.log' for more details." >&5
  13. -$as_echo "$as_me: error: cannot run test program while cross compiling
  14. -See \`config.log' for more details." >&2;}
  15. - { (exit 1); exit 1; }; }; }
  16. -else
  17. - cat >conftest.$ac_ext <<_ACEOF
  18. -/* confdefs.h. */
  19. -_ACEOF
  20. -cat confdefs.h >>conftest.$ac_ext
  21. -cat >>conftest.$ac_ext <<_ACEOF
  22. -/* end confdefs.h. */
  23. -
  24. - int main()
  25. - {
  26. - long x;
  27. - long y;
  28. - long res;
  29. - char c;
  30. -
  31. - x = 10;
  32. - y = 123;
  33. - res = __sync_bool_compare_and_swap(&x, x, y);
  34. - if (!res || x != y) {
  35. - return(1);
  36. - }
  37. -
  38. - x = 10;
  39. - y = 123;
  40. - res = __sync_bool_compare_and_swap(&x, x + 1, y);
  41. - if (res || x != 10) {
  42. - return(1);
  43. - }
  44. -
  45. - x = 10;
  46. - y = 123;
  47. - res = __sync_add_and_fetch(&x, y);
  48. - if (res != 123 + 10 || x != 123 + 10) {
  49. - return(1);
  50. - }
  51. -
  52. - c = 10;
  53. - res = __sync_lock_test_and_set(&c, 123);
  54. - if (res != 10 || c != 123) {
  55. - return(1);
  56. - }
  57. -
  58. - return(0);
  59. - }
  60. -
  61. -_ACEOF
  62. -rm -f conftest$ac_exeext
  63. -if { (ac_try="$ac_link"
  64. -case "(($ac_try" in
  65. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  66. - *) ac_try_echo=$ac_try;;
  67. -esac
  68. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  69. -$as_echo "$ac_try_echo") >&5
  70. - (eval "$ac_link") 2>&5
  71. - ac_status=$?
  72. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  73. - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
  74. - { (case "(($ac_try" in
  75. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  76. - *) ac_try_echo=$ac_try;;
  77. -esac
  78. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  79. -$as_echo "$ac_try_echo") >&5
  80. - (eval "$ac_try") 2>&5
  81. - ac_status=$?
  82. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  83. - (exit $ac_status); }; }; then
  84. -
  85. -
  86. cat >>confdefs.h <<\_ACEOF
  87. #define HAVE_IB_GCC_ATOMIC_BUILTINS 1
  88. _ACEOF
  89. - { $as_echo "$as_me:$LINENO: result: yes" >&5
  90. -$as_echo "yes" >&6; }
  91. -
  92. -else
  93. - $as_echo "$as_me: program exited with status $ac_status" >&5
  94. -$as_echo "$as_me: failed program was:" >&5
  95. -sed 's/^/| /' conftest.$ac_ext >&5
  96. -
  97. -( exit $ac_status )
  98. -
  99. - { $as_echo "$as_me:$LINENO: result: no" >&5
  100. -$as_echo "no" >&6; }
  101. -
  102. -
  103. -fi
  104. -rm -rf conftest.dSYM
  105. -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  106. -fi
  107. -
  108. -
  109. -
  110. - { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by GCC atomic builtins" >&5
  111. -$as_echo_n "checking whether pthread_t can be used by GCC atomic builtins... " >&6; }
  112. - # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
  113. - if test "$cross_compiling" = yes; then
  114. - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  115. -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  116. -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
  117. -See \`config.log' for more details." >&5
  118. -$as_echo "$as_me: error: cannot run test program while cross compiling
  119. -See \`config.log' for more details." >&2;}
  120. - { (exit 1); exit 1; }; }; }
  121. -else
  122. - cat >conftest.$ac_ext <<_ACEOF
  123. -/* confdefs.h. */
  124. -_ACEOF
  125. -cat confdefs.h >>conftest.$ac_ext
  126. -cat >>conftest.$ac_ext <<_ACEOF
  127. -/* end confdefs.h. */
  128. -
  129. - #include <pthread.h>
  130. - #include <string.h>
  131. -
  132. - int main(int argc, char** argv) {
  133. - pthread_t x1;
  134. - pthread_t x2;
  135. - pthread_t x3;
  136. -
  137. - memset(&x1, 0x0, sizeof(x1));
  138. - memset(&x2, 0x0, sizeof(x2));
  139. - memset(&x3, 0x0, sizeof(x3));
  140. -
  141. - __sync_bool_compare_and_swap(&x1, x2, x3);
  142. -
  143. - return(0);
  144. - }
  145. -
  146. -_ACEOF
  147. -rm -f conftest$ac_exeext
  148. -if { (ac_try="$ac_link"
  149. -case "(($ac_try" in
  150. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  151. - *) ac_try_echo=$ac_try;;
  152. -esac
  153. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  154. -$as_echo "$ac_try_echo") >&5
  155. - (eval "$ac_link") 2>&5
  156. - ac_status=$?
  157. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  158. - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
  159. - { (case "(($ac_try" in
  160. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  161. - *) ac_try_echo=$ac_try;;
  162. -esac
  163. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  164. -$as_echo "$ac_try_echo") >&5
  165. - (eval "$ac_try") 2>&5
  166. - ac_status=$?
  167. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  168. - (exit $ac_status); }; }; then
  169. -
  170. -
  171. cat >>confdefs.h <<\_ACEOF
  172. #define HAVE_IB_ATOMIC_PTHREAD_T_GCC 1
  173. _ACEOF
  174. - { $as_echo "$as_me:$LINENO: result: yes" >&5
  175. -$as_echo "yes" >&6; }
  176. -
  177. -else
  178. - $as_echo "$as_me: program exited with status $ac_status" >&5
  179. -$as_echo "$as_me: failed program was:" >&5
  180. -sed 's/^/| /' conftest.$ac_ext >&5
  181. -
  182. -( exit $ac_status )
  183. -
  184. - { $as_echo "$as_me:$LINENO: result: no" >&5
  185. -$as_echo "no" >&6; }
  186. -
  187. -
  188. -fi
  189. -rm -rf conftest.dSYM
  190. -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  191. -fi
  192. -
  193. -
  194. { $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5
  195. $as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; }
  196. @@ -47284,101 +47101,6 @@ fi
  197. done
  198. - { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by Solaris libc atomic functions" >&5
  199. -$as_echo_n "checking whether pthread_t can be used by Solaris libc atomic functions... " >&6; }
  200. - # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
  201. - if test "$cross_compiling" = yes; then
  202. - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  203. -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  204. -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
  205. -See \`config.log' for more details." >&5
  206. -$as_echo "$as_me: error: cannot run test program while cross compiling
  207. -See \`config.log' for more details." >&2;}
  208. - { (exit 1); exit 1; }; }; }
  209. -else
  210. - cat >conftest.$ac_ext <<_ACEOF
  211. -/* confdefs.h. */
  212. -_ACEOF
  213. -cat confdefs.h >>conftest.$ac_ext
  214. -cat >>conftest.$ac_ext <<_ACEOF
  215. -/* end confdefs.h. */
  216. -
  217. - #include <pthread.h>
  218. - #include <string.h>
  219. -
  220. - int main(int argc, char** argv) {
  221. - pthread_t x1;
  222. - pthread_t x2;
  223. - pthread_t x3;
  224. -
  225. - memset(&x1, 0x0, sizeof(x1));
  226. - memset(&x2, 0x0, sizeof(x2));
  227. - memset(&x3, 0x0, sizeof(x3));
  228. -
  229. - if (sizeof(pthread_t) == 4) {
  230. -
  231. - atomic_cas_32(&x1, x2, x3);
  232. -
  233. - } else if (sizeof(pthread_t) == 8) {
  234. -
  235. - atomic_cas_64(&x1, x2, x3);
  236. -
  237. - } else {
  238. -
  239. - return(1);
  240. - }
  241. -
  242. - return(0);
  243. - }
  244. -
  245. -_ACEOF
  246. -rm -f conftest$ac_exeext
  247. -if { (ac_try="$ac_link"
  248. -case "(($ac_try" in
  249. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  250. - *) ac_try_echo=$ac_try;;
  251. -esac
  252. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  253. -$as_echo "$ac_try_echo") >&5
  254. - (eval "$ac_link") 2>&5
  255. - ac_status=$?
  256. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  257. - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
  258. - { (case "(($ac_try" in
  259. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  260. - *) ac_try_echo=$ac_try;;
  261. -esac
  262. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  263. -$as_echo "$ac_try_echo") >&5
  264. - (eval "$ac_try") 2>&5
  265. - ac_status=$?
  266. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  267. - (exit $ac_status); }; }; then
  268. -
  269. -
  270. -cat >>confdefs.h <<\_ACEOF
  271. -#define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS 1
  272. -_ACEOF
  273. -
  274. - { $as_echo "$as_me:$LINENO: result: yes" >&5
  275. -$as_echo "yes" >&6; }
  276. -
  277. -else
  278. - $as_echo "$as_me: program exited with status $ac_status" >&5
  279. -$as_echo "$as_me: failed program was:" >&5
  280. -sed 's/^/| /' conftest.$ac_ext >&5
  281. -
  282. -( exit $ac_status )
  283. -
  284. - { $as_echo "$as_me:$LINENO: result: no" >&5
  285. -$as_echo "no" >&6; }
  286. -
  287. -
  288. -fi
  289. -rm -rf conftest.dSYM
  290. -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  291. -fi
  292. -
  293. # this is needed to know which one of atomic_cas_32() or atomic_cas_64()