You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

140 lines
3.7 KiB

  1. --- a/configure
  2. +++ b/configure
  3. @@ -5646,66 +5646,66 @@ done
  4. -for flag in -fstack-protector; do
  5. - as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh`
  6. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
  7. -$as_echo_n "checking whether C compiler accepts $flag... " >&6; }
  8. -if eval \${$as_CACHEVAR+:} false; then :
  9. - $as_echo_n "(cached) " >&6
  10. -else
  11. -
  12. - ax_check_save_flags=$CFLAGS
  13. - CFLAGS="$CFLAGS $flag"
  14. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  15. -/* end confdefs.h. */
  16. -
  17. -int
  18. -main ()
  19. -{
  20. -
  21. - ;
  22. - return 0;
  23. -}
  24. -_ACEOF
  25. -if ac_fn_c_try_compile "$LINENO"; then :
  26. - eval "$as_CACHEVAR=yes"
  27. -else
  28. - eval "$as_CACHEVAR=no"
  29. -fi
  30. -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  31. - CFLAGS=$ax_check_save_flags
  32. -fi
  33. -eval ac_res=\$$as_CACHEVAR
  34. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  35. -$as_echo "$ac_res" >&6; }
  36. -if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
  37. - if ${CFLAGS+:} false; then :
  38. - case " $CFLAGS " in
  39. - *" $flag "*)
  40. - { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
  41. - (: CFLAGS already contains $flag) 2>&5
  42. - ac_status=$?
  43. - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  44. - test $ac_status = 0; }
  45. - ;;
  46. - *)
  47. - { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
  48. - (: CFLAGS="$CFLAGS $flag") 2>&5
  49. - ac_status=$?
  50. - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  51. - test $ac_status = 0; }
  52. - CFLAGS="$CFLAGS $flag"
  53. - ;;
  54. - esac
  55. -else
  56. - CFLAGS="$flag"
  57. -fi
  58. -
  59. -else
  60. - :
  61. -fi
  62. -
  63. -done
  64. +#for flag in -fstack-protector; do
  65. +# as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh`
  66. +#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
  67. +#$as_echo_n "checking whether C compiler accepts $flag... " >&6; }
  68. +#if eval \${$as_CACHEVAR+:} false; then :
  69. +# $as_echo_n "(cached) " >&6
  70. +#else
  71. +#
  72. +# ax_check_save_flags=$CFLAGS
  73. +# CFLAGS="$CFLAGS $flag"
  74. +# cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  75. +#/* end confdefs.h. */
  76. +
  77. +#int
  78. +#main ()
  79. +#{
  80. +#
  81. +# ;
  82. +# return 0;
  83. +#}
  84. +#_ACEOF
  85. +#if ac_fn_c_try_compile "$LINENO"; then :
  86. +# eval "$as_CACHEVAR=yes"
  87. +#else
  88. +# eval "$as_CACHEVAR=no"
  89. +#fi
  90. +#rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  91. +# CFLAGS=$ax_check_save_flags
  92. +#fi
  93. +#eval ac_res=\$$as_CACHEVAR
  94. +# { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  95. +#$as_echo "$ac_res" >&6; }
  96. +#if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
  97. +# if ${CFLAGS+:} false; then :
  98. +# case " $CFLAGS " in
  99. +# *" $flag "*)
  100. +# { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
  101. +# (: CFLAGS already contains $flag) 2>&5
  102. +# ac_status=$?
  103. +# $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  104. +# test $ac_status = 0; }
  105. +# ;;
  106. +# *)
  107. +# { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
  108. +# (: CFLAGS="$CFLAGS $flag") 2>&5
  109. +# ac_status=$?
  110. +# $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  111. +# test $ac_status = 0; }
  112. +# CFLAGS="$CFLAGS $flag"
  113. +# ;;
  114. +# esac
  115. +#else
  116. +# CFLAGS="$flag"
  117. +#fi
  118. +#
  119. +#else
  120. +# :
  121. +#fi
  122. +#
  123. +#done
  124. --- a/configure.ac
  125. +++ b/configure.ac
  126. @@ -71,7 +71,7 @@ AX_APPEND_COMPILE_FLAGS([-Wformat=2])
  127. AX_APPEND_COMPILE_FLAGS([-Wconversion])
  128. AX_APPEND_COMPILE_FLAGS([-Wno-long-long])
  129. AX_APPEND_COMPILE_FLAGS([-Wno-deprecated-declarations])
  130. -AX_APPEND_COMPILE_FLAGS([-fstack-protector])
  131. +#AX_APPEND_COMPILE_FLAGS([-fstack-protector])
  132. AX_APPEND_COMPILE_FLAGS([-fPIE])
  133. AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2])
  134. AX_APPEND_LINK_FLAGS([-fPIE -pie])