Gentoo Archives: gentoo-commits

From: "Matt Thode (prometheanfire)" <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/libmemcached/files: libmemcached-1.0.17-gcc4_8.patch
Date: Mon, 27 Jan 2014 08:30:28
Message-Id: 20140127083023.139382004E@flycatcher.gentoo.org
1 prometheanfire 14/01/27 08:30:23
2
3 Added: libmemcached-1.0.17-gcc4_8.patch
4 Log:
5 removing the old and jankey, adding the new hotness
6
7 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
8
9 Revision Changes Path
10 1.1 dev-libs/libmemcached/files/libmemcached-1.0.17-gcc4_8.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libmemcached/files/libmemcached-1.0.17-gcc4_8.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libmemcached/files/libmemcached-1.0.17-gcc4_8.patch?rev=1.1&content-type=text/plain
14
15 Index: libmemcached-1.0.17-gcc4_8.patch
16 ===================================================================
17 Description: Fix compilation with gcc-4.8
18 This patch fixes the error flags made incompatible with gcc-4.8:
19 g++: error: -fsanitize=address is incompatible with -fsanitize=thread
20 Author: Brian Aker
21 Last-Update: 2013-06-14
22 Bug: https://bugs.launchpad.net/libmemcached/+bug/1164442
23
24 --- a/libtest/run.gdb 2012-03-26 01:08:09 +0000
25 +++ b/libtest/run.gdb 2013-04-10 05:25:24 +0000
26 @@ -1,5 +1,6 @@
27 set logging on
28 set logging overwrite on
29 set environment LIBTEST_IN_GDB=1
30 +set ASAN_OPTIONS=abort_on_error=1
31 run
32 thread apply all bt
33
34 --- a/m4/ax_harden_compiler_flags.m4 2013-02-12 05:44:21 +0000
35 +++ b/m4/ax_harden_compiler_flags.m4 2013-04-10 05:25:24 +0000
36 @@ -53,7 +53,7 @@
37 # ? _APPEND_COMPILE_FLAGS_ERROR([-Wlong-long]) -- Don't turn on for
38 # compatibility issues memcached_stat_st
39
40 -#serial 8
41 +#serial 9
42
43 AC_DEFUN([_WARNINGS_AS_ERRORS],
44 [AC_CACHE_CHECK([if all warnings into errors],[ac_cv_warnings_as_errors],
45 @@ -92,9 +92,12 @@
46 _APPEND_COMPILE_FLAGS_ERROR([-H])
47 _APPEND_COMPILE_FLAGS_ERROR([-ggdb])
48 _APPEND_COMPILE_FLAGS_ERROR([-g])
49 - _APPEND_COMPILE_FLAGS_ERROR([-O0])],
50 - [_APPEND_COMPILE_FLAGS_ERROR([-g])
51 - _APPEND_COMPILE_FLAGS_ERROR([-O2])])
52 + _APPEND_COMPILE_FLAGS_ERROR([-O0]),
53 + _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
54 + ],[
55 + _APPEND_COMPILE_FLAGS_ERROR([-g])
56 + _APPEND_COMPILE_FLAGS_ERROR([-O2])
57 + ])
58
59 AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
60 [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])
61 @@ -155,26 +158,31 @@
62 _APPEND_COMPILE_FLAGS_ERROR([-Wundef])
63 _APPEND_COMPILE_FLAGS_ERROR([-Wunsafe-loop-optimizations])
64 _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations])
65 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
66 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
67 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
68 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
69 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
70 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
71 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
72 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
73 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
74 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
75 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
76 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
77 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
78 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
79 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
80 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
81 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
82 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
83 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
84 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
85 + AS_IF([test "x$ac_cv_vcs_checkout" = xyes],[
86 + _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
87 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
88 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
89 + AS_IF([test "x$enable_shared" = "xyes"],[
90 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
91 + ])
92 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
93 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
94 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
95 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
96 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
97 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
98 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
99 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
100 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
101 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
102 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
103 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
104 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
105 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
106 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
107 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
108 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
109 + ])
110 _APPEND_COMPILE_FLAGS_ERROR([-Wclobbered])
111 _APPEND_COMPILE_FLAGS_ERROR([-Wunused])
112 _APPEND_COMPILE_FLAGS_ERROR([-Wunused-result])
113 @@ -186,6 +194,7 @@
114 _APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
115 _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
116 _APPEND_COMPILE_FLAGS_ERROR([-pipe])
117 + _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess])
118
119 AS_IF([test "x$ax_enable_debug" = xno],
120 [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
121 @@ -213,9 +222,12 @@
122 _APPEND_COMPILE_FLAGS_ERROR([-H])
123 _APPEND_COMPILE_FLAGS_ERROR([-ggdb])
124 _APPEND_COMPILE_FLAGS_ERROR([-g])
125 - _APPEND_COMPILE_FLAGS_ERROR([-O0])],
126 - [_APPEND_COMPILE_FLAGS_ERROR([-g])
127 - _APPEND_COMPILE_FLAGS_ERROR([-O2])])
128 + _APPEND_COMPILE_FLAGS_ERROR([-O0]),
129 + _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
130 + ],[
131 + _APPEND_COMPILE_FLAGS_ERROR([-g])
132 + _APPEND_COMPILE_FLAGS_ERROR([-O2])
133 + ])
134
135 AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
136 [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])
137 @@ -268,27 +280,32 @@
138 _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations])
139 _APPEND_COMPILE_FLAGS_ERROR([-Wc++11-compat])
140 # _APPEND_COMPILE_FLAGS_ERROR([-Weffc++])
141 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
142 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
143 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
144 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
145 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
146 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
147 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
148 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
149 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
150 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
151 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
152 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
153 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
154 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
155 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
156 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
157 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
158 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
159 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
160 - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
161 -# _APPEND_COMPILE_FLAGS_ERROR([-Wold-style-cast])
162 + AS_IF([test "x$ac_cv_vcs_checkout" = xyes],[
163 + _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
164 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
165 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
166 + AS_IF([test "x$enable_shared" = "xyes"],[
167 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
168 + ])
169 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
170 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
171 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
172 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
173 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
174 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
175 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
176 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
177 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
178 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
179 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
180 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
181 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
182 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
183 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
184 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
185 + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
186 + ])
187 +# _APPEND_COMPILE_FLAGS_ERROR([-Wold-style-cast])
188 _APPEND_COMPILE_FLAGS_ERROR([-Wclobbered])
189 _APPEND_COMPILE_FLAGS_ERROR([-Wunused])
190 _APPEND_COMPILE_FLAGS_ERROR([-Wunused-result])
191 @@ -301,6 +318,7 @@
192 _APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
193 _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
194 _APPEND_COMPILE_FLAGS_ERROR([-pipe])
195 + _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess])
196
197 AS_IF([test "x$ax_enable_debug" = xno],
198 [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],