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
140 lines
3.7 KiB
--- a/configure
|
|
+++ b/configure
|
|
@@ -5646,66 +5646,66 @@ done
|
|
|
|
|
|
|
|
-for flag in -fstack-protector; do
|
|
- as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh`
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
|
|
-$as_echo_n "checking whether C compiler accepts $flag... " >&6; }
|
|
-if eval \${$as_CACHEVAR+:} false; then :
|
|
- $as_echo_n "(cached) " >&6
|
|
-else
|
|
-
|
|
- ax_check_save_flags=$CFLAGS
|
|
- CFLAGS="$CFLAGS $flag"
|
|
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
-/* end confdefs.h. */
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-if ac_fn_c_try_compile "$LINENO"; then :
|
|
- eval "$as_CACHEVAR=yes"
|
|
-else
|
|
- eval "$as_CACHEVAR=no"
|
|
-fi
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
- CFLAGS=$ax_check_save_flags
|
|
-fi
|
|
-eval ac_res=\$$as_CACHEVAR
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
-$as_echo "$ac_res" >&6; }
|
|
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
|
|
- if ${CFLAGS+:} false; then :
|
|
- case " $CFLAGS " in
|
|
- *" $flag "*)
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
|
|
- (: CFLAGS already contains $flag) 2>&5
|
|
- ac_status=$?
|
|
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
- test $ac_status = 0; }
|
|
- ;;
|
|
- *)
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
|
|
- (: CFLAGS="$CFLAGS $flag") 2>&5
|
|
- ac_status=$?
|
|
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
- test $ac_status = 0; }
|
|
- CFLAGS="$CFLAGS $flag"
|
|
- ;;
|
|
- esac
|
|
-else
|
|
- CFLAGS="$flag"
|
|
-fi
|
|
-
|
|
-else
|
|
- :
|
|
-fi
|
|
-
|
|
-done
|
|
+#for flag in -fstack-protector; do
|
|
+# as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh`
|
|
+#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
|
|
+#$as_echo_n "checking whether C compiler accepts $flag... " >&6; }
|
|
+#if eval \${$as_CACHEVAR+:} false; then :
|
|
+# $as_echo_n "(cached) " >&6
|
|
+#else
|
|
+#
|
|
+# ax_check_save_flags=$CFLAGS
|
|
+# CFLAGS="$CFLAGS $flag"
|
|
+# cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+#/* end confdefs.h. */
|
|
+
|
|
+#int
|
|
+#main ()
|
|
+#{
|
|
+#
|
|
+# ;
|
|
+# return 0;
|
|
+#}
|
|
+#_ACEOF
|
|
+#if ac_fn_c_try_compile "$LINENO"; then :
|
|
+# eval "$as_CACHEVAR=yes"
|
|
+#else
|
|
+# eval "$as_CACHEVAR=no"
|
|
+#fi
|
|
+#rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+# CFLAGS=$ax_check_save_flags
|
|
+#fi
|
|
+#eval ac_res=\$$as_CACHEVAR
|
|
+# { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
+#$as_echo "$ac_res" >&6; }
|
|
+#if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
|
|
+# if ${CFLAGS+:} false; then :
|
|
+# case " $CFLAGS " in
|
|
+# *" $flag "*)
|
|
+# { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
|
|
+# (: CFLAGS already contains $flag) 2>&5
|
|
+# ac_status=$?
|
|
+# $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+# test $ac_status = 0; }
|
|
+# ;;
|
|
+# *)
|
|
+# { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
|
|
+# (: CFLAGS="$CFLAGS $flag") 2>&5
|
|
+# ac_status=$?
|
|
+# $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+# test $ac_status = 0; }
|
|
+# CFLAGS="$CFLAGS $flag"
|
|
+# ;;
|
|
+# esac
|
|
+#else
|
|
+# CFLAGS="$flag"
|
|
+#fi
|
|
+#
|
|
+#else
|
|
+# :
|
|
+#fi
|
|
+#
|
|
+#done
|
|
|
|
|
|
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -71,7 +71,7 @@ AX_APPEND_COMPILE_FLAGS([-Wformat=2])
|
|
AX_APPEND_COMPILE_FLAGS([-Wconversion])
|
|
AX_APPEND_COMPILE_FLAGS([-Wno-long-long])
|
|
AX_APPEND_COMPILE_FLAGS([-Wno-deprecated-declarations])
|
|
-AX_APPEND_COMPILE_FLAGS([-fstack-protector])
|
|
+#AX_APPEND_COMPILE_FLAGS([-fstack-protector])
|
|
AX_APPEND_COMPILE_FLAGS([-fPIE])
|
|
AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2])
|
|
AX_APPEND_LINK_FLAGS([-fPIE -pie])
|