patch-configure 3.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141
  1. --- ruby-2.0.0-p247.orig/configure 2013-06-27 13:16:17.000000000 +0200
  2. +++ ruby-2.0.0-p247/configure 2013-10-24 11:12:04.000000000 +0200
  3. @@ -7373,138 +7373,6 @@ else
  4. fi
  5. - # -fstack-protector
  6. - case "$target_os" in #(
  7. - mingw*|nacl|haiku) :
  8. -
  9. - stack_protector=no
  10. - ;; #(
  11. - *) :
  12. -
  13. -
  14. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -fstack-protector is accepted as CFLAGS" >&5
  15. -$as_echo_n "checking whether -fstack-protector is accepted as CFLAGS... " >&6; }
  16. - save_CFLAGS="$CFLAGS"
  17. -CFLAGS="$CFLAGS $rb_cv_warnflags"
  18. -if test "${ac_c_werror_flag+set}"; then
  19. - rb_c_werror_flag="$ac_c_werror_flag"
  20. -else
  21. - unset rb_c_werror_flag
  22. -fi
  23. -ac_c_werror_flag=yes
  24. -
  25. - CFLAGS="$CFLAGS -fstack-protector"
  26. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  27. -/* end confdefs.h. */
  28. -
  29. -int
  30. -main ()
  31. -{
  32. -
  33. - ;
  34. - return 0;
  35. -}
  36. -_ACEOF
  37. -if ac_fn_c_try_compile "$LINENO"; then :
  38. - stack_protector=yes
  39. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  40. -$as_echo "yes" >&6; }
  41. -else
  42. - stack_protector=no
  43. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  44. -$as_echo "no" >&6; }
  45. -fi
  46. -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  47. -
  48. -CFLAGS="$save_CFLAGS"
  49. -save_CFLAGS=
  50. -if test "${rb_c_werror_flag+set}"; then
  51. - ac_c_werror_flag="$rb_c_werror_flag"
  52. -else
  53. - unset ac_c_werror_flag
  54. -fi
  55. -
  56. - if test "x$stack_protector" = xyes; then
  57. -
  58. - save_LDFLAGS="$LDFLAGS"
  59. - LDFLAGS="$LDFLAGS -fstack-protector"
  60. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -fstack-protector is accepted as LDFLAGS" >&5
  61. -$as_echo_n "checking whether -fstack-protector is accepted as LDFLAGS... " >&6; }
  62. - save_CFLAGS="$CFLAGS"
  63. -CFLAGS="$CFLAGS $rb_cv_warnflags"
  64. -if test "${ac_c_werror_flag+set}"; then
  65. - rb_c_werror_flag="$ac_c_werror_flag"
  66. -else
  67. - unset rb_c_werror_flag
  68. -fi
  69. -ac_c_werror_flag=yes
  70. -
  71. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  72. -/* end confdefs.h. */
  73. -
  74. -int
  75. -main ()
  76. -{
  77. -
  78. - ;
  79. - return 0;
  80. -}
  81. -_ACEOF
  82. -if ac_fn_c_try_link "$LINENO"; then :
  83. -
  84. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  85. -$as_echo "yes" >&6; }
  86. -else
  87. - stack_protector=broken
  88. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  89. -$as_echo "no" >&6; }
  90. -fi
  91. -rm -f core conftest.err conftest.$ac_objext \
  92. - conftest$ac_exeext conftest.$ac_ext
  93. -
  94. -CFLAGS="$save_CFLAGS"
  95. -save_CFLAGS=
  96. -if test "${rb_c_werror_flag+set}"; then
  97. - ac_c_werror_flag="$rb_c_werror_flag"
  98. -else
  99. - unset ac_c_werror_flag
  100. -fi
  101. - LDFLAGS="$save_LDFLAGS"
  102. - save_LDFLAGS=
  103. -
  104. - fi
  105. - ;;
  106. -esac
  107. - if test "x$stack_protector" = xyes; then
  108. - # RUBY_APPEND_OPTION(XCFLAGS, -fstack-protector)
  109. - case " ${XCFLAGS-} " in #(
  110. - *' -fstack-protector '*) :
  111. - ;; #(
  112. - ' ') :
  113. - XCFLAGS="-fstack-protector" ;; #(
  114. - *) :
  115. - XCFLAGS="$XCFLAGS -fstack-protector" ;;
  116. -esac
  117. - # RUBY_APPEND_OPTION(XLDFLAGS, -fstack-protector)
  118. - case " ${XLDFLAGS-} " in #(
  119. - *' -fstack-protector '*) :
  120. - ;; #(
  121. - ' ') :
  122. - XLDFLAGS="-fstack-protector" ;; #(
  123. - *) :
  124. - XLDFLAGS="$XLDFLAGS -fstack-protector" ;;
  125. -esac
  126. - # RUBY_APPEND_OPTION(LDFLAGS, -fstack-protector)
  127. - case " ${LDFLAGS-} " in #(
  128. - *' -fstack-protector '*) :
  129. - ;; #(
  130. - ' ') :
  131. - LDFLAGS="-fstack-protector" ;; #(
  132. - *) :
  133. - LDFLAGS="$LDFLAGS -fstack-protector" ;;
  134. -esac
  135. - fi
  136. -
  137. case "$target_os" in #(
  138. mingw*) :