Gentoo Archives: gentoo-commits

From: "Anthony G. Basile (blueness)" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/cyassl/files: cyassl-2.9.4-remove-hardened-flags.patch
Date: Mon, 09 Jun 2014 20:45:59
Message-Id: 20140609204555.47DB02004F@flycatcher.gentoo.org
1 blueness 14/06/09 20:45:55
2
3 Added: cyassl-2.9.4-remove-hardened-flags.patch
4 Log:
5 Remove all -W flags and most -f flags, bug #512314
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
8
9 Revision Changes Path
10 1.1 net-libs/cyassl/files/cyassl-2.9.4-remove-hardened-flags.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/cyassl/files/cyassl-2.9.4-remove-hardened-flags.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/cyassl/files/cyassl-2.9.4-remove-hardened-flags.patch?rev=1.1&content-type=text/plain
14
15 Index: cyassl-2.9.4-remove-hardened-flags.patch
16 ===================================================================
17 diff -Naur cyassl-2.9.4.orig/configure.ac cyassl-2.9.4/configure.ac
18 --- cyassl-2.9.4.orig/configure.ac 2014-04-09 13:23:26.000000000 -0400
19 +++ cyassl-2.9.4/configure.ac 2014-06-09 13:38:59.988657720 -0400
20 @@ -13,7 +13,7 @@
21 AC_CANONICAL_HOST
22 AC_CANONICAL_BUILD
23
24 -AM_INIT_AUTOMAKE([1.11 -Wall -Werror -Wno-portability foreign tar-ustar subdir-objects no-define color-tests])
25 +AM_INIT_AUTOMAKE([1.11 foreign tar-ustar subdir-objects no-define color-tests])
26 AC_PREREQ([2.63])
27
28 AC_ARG_PROGRAM
29 @@ -1586,7 +1586,6 @@
30 # OPTIMIZE FLAGS
31 if test "$GCC" = "yes"
32 then
33 - AM_CFLAGS="$AM_CFLAGS -Wall -Wno-unused"
34 if test "$ax_enable_debug" = "no"
35 then
36 if test "$ENABLED_FASTMATH" = "yes"
37 @@ -1603,7 +1602,7 @@
38 fi
39
40 LIB_SOCKET_NSL
41 -AX_HARDEN_CC_COMPILER_FLAGS
42 +dnl AX_HARDEN_CC_COMPILER_FLAGS
43
44 # link to ws2_32 if on mingw
45 case $host_os in
46 @@ -1612,8 +1611,8 @@
47 esac
48
49 # add user C_EXTRA_FLAGS back
50 -CFLAGS="$CFLAGS $USER_C_EXTRA_FLAGS"
51 -OPTION_FLAGS="$USER_C_EXTRA_FLAGS $AM_CFLAGS"
52 +CFLAGS="-fwrapv $CFLAGS"
53 +OPTION_FLAGS="$AM_CFLAGS"
54
55 CREATE_HEX_VERSION
56 AC_SUBST([AM_CPPFLAGS])
57 diff -Naur cyassl-2.9.4.orig/m4/ax_debug.m4 cyassl-2.9.4/m4/ax_debug.m4
58 --- cyassl-2.9.4.orig/m4/ax_debug.m4 2014-03-27 13:44:24.000000000 -0400
59 +++ cyassl-2.9.4/m4/ax_debug.m4 2014-06-09 13:34:14.291644716 -0400
60 @@ -43,19 +43,21 @@
61 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
62 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
63
64 -#serial 6
65 +#serial 6.1
66
67 AC_DEFUN([AX_DEBUG],
68 [AC_PREREQ([2.63])dnl
69 AC_ARG_ENABLE([debug],
70 [AS_HELP_STRING([--enable-debug],
71 [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],
72 - [ax_enable_debug=yes
73 - AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.])],
74 - [ax_enable_debug=no
75 - AC_SUBST([MCHECK])
76 - AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])])
77 + [ax_enable_debug=$enableval],
78 + [ax_enable_debug=no])
79 +
80 + AS_IF([test "x$ax_enable_debug" = xyes],
81 + [AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.])],
82 + [AC_SUBST([MCHECK])
83 + AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])])
84
85 AC_MSG_CHECKING([for debug])
86 AC_MSG_RESULT([$ax_enable_debug])
87 - AM_CONDITIONAL([DEBUG],[test "x${ax_enable_debug}" = "xyes"])])
88 + AM_CONDITIONAL([DEBUG],[test "x${ax_enable_debug}" = xyes])])