Merge lp:~brianaker/gearmand/m4-updates-june into lp:gearmand
- m4-updates-june
- Merge into 1.2
Proposed by
Brian Aker
Status: | Merged |
---|---|
Merged at revision: | 782 |
Proposed branch: | lp:~brianaker/gearmand/m4-updates-june |
Merge into: | lp:gearmand |
Diff against target: |
256 lines (+125/-56) 3 files modified
.bzrignore (+69/-0) m4/ax_harden_compiler_flags.m4 (+54/-55) m4/ax_prog_sphinx_build.m4 (+2/-1) |
To merge this branch: | bzr merge lp:~brianaker/gearmand/m4-updates-june |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tangent Trunk | Pending | ||
Review via email: mp+169929@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
- 780. By Brian Aker
-
Fix case where we are not passing warnings.`
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file '.bzrignore' |
2 | --- .bzrignore 2013-06-06 22:48:07 +0000 |
3 | +++ .bzrignore 2013-06-17 20:42:29 +0000 |
4 | @@ -47,3 +47,72 @@ |
5 | tests/worker_test |
6 | valgrind*xml |
7 | cmd*xml |
8 | +*.log |
9 | +*.trs |
10 | +*.lo |
11 | +*.la |
12 | +man/*.1 |
13 | +man/*.3 |
14 | +man/*.8 |
15 | +man/.doctrees/ |
16 | +gearmand/gearmand |
17 | +gearmand/hostile_gearmand |
18 | +libgearman-1.0/t/c_test |
19 | +libgearman-1.0/t/cc_test |
20 | +libhostile/t/accept |
21 | +libhostile/t/close |
22 | +libhostile/t/hostile_accept |
23 | +libhostile/t/hostile_close |
24 | +libhostile/t/hostile_pipe |
25 | +libhostile/t/hostile_pipe2 |
26 | +libhostile/t/pipe |
27 | +libhostile/t/pipe2 |
28 | +libtest/abort |
29 | +libtest/backtrace |
30 | +libtest/core-count |
31 | +libtest/skiptest |
32 | +libtest/unittest |
33 | +libtest/wait |
34 | +tests/blobslap_client |
35 | +tests/c_test |
36 | +tests/cli |
37 | +tests/cpp_test |
38 | +tests/cycle |
39 | +tests/drizzle_test |
40 | +tests/ephemeral_test |
41 | +tests/gearmand |
42 | +tests/hostile_gearmand |
43 | +tests/hostile_libgearman |
44 | +tests/httpd_test |
45 | +tests/memcached_test |
46 | +tests/mysql_test |
47 | +tests/postgres_test |
48 | +tests/redis_test |
49 | +tests/result |
50 | +tests/round_robin_test |
51 | +tests/sqlite_test |
52 | +tests/stress |
53 | +tests/tokyocabinet_test |
54 | +tests/vector |
55 | +tests/libgearman-1.0/1077917 |
56 | +tests/libgearman-1.0/client_test |
57 | +tests/libgearman-1.0/internals_test |
58 | +tests/libgearman-1.0/multi_client_test |
59 | +tests/libgearman-1.0/worker_test |
60 | +benchmark/blobslap_client |
61 | +benchmark/blobslap_worker |
62 | +bin/gearadmin |
63 | +bin/gearman |
64 | +docs/libgearman/examples/gearman_client_do_background_example |
65 | +docs/libgearman/examples/gearman_client_do_example |
66 | +docs/libgearman/examples/gearman_execute_example |
67 | +docs/libgearman/examples/gearman_execute_partition |
68 | +examples/echo_client |
69 | +examples/echo_worker |
70 | +examples/reverse_client |
71 | +examples/reverse_client_bg |
72 | +examples/reverse_client_cb |
73 | +examples/reverse_client_epoch |
74 | +examples/reverse_worker |
75 | +examples/wc_worker |
76 | +tmp_chroot |
77 | |
78 | === modified file 'm4/ax_harden_compiler_flags.m4' |
79 | --- m4/ax_harden_compiler_flags.m4 2013-04-29 15:09:13 +0000 |
80 | +++ m4/ax_harden_compiler_flags.m4 2013-06-17 20:42:29 +0000 |
81 | @@ -53,7 +53,39 @@ |
82 | # -Wdeclaration-after-statement is counter to C99 |
83 | # _APPEND_COMPILE_FLAGS_ERROR([-pedantic]) |
84 | |
85 | -#serial 10 |
86 | +#serial 11 |
87 | + |
88 | +AC_DEFUN([_SET_SANITIZE_FLAGS], |
89 | + [AS_IF([test "x$MINGW" != xyes],[ |
90 | + AS_IF([test "x$enable_shared" = "xyes"], |
91 | + [AS_CASE([$ax_harden_sanitize], |
92 | + [thread],[ |
93 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])], |
94 | + [address],[ |
95 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])], |
96 | + [rest],[ |
97 | + _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer]) |
98 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer]) |
99 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory]) |
100 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment]) |
101 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool]) |
102 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds]) |
103 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum]) |
104 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow]) |
105 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero]) |
106 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero]) |
107 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null]) |
108 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size]) |
109 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return]) |
110 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift]) |
111 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow]) |
112 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable]) |
113 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow]) |
114 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound]) |
115 | + _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])]) |
116 | + ]) |
117 | + ]) |
118 | + ]) |
119 | |
120 | AC_DEFUN([_WARNINGS_AS_ERRORS], |
121 | [AC_CACHE_CHECK([if all warnings into errors],[ac_cv_warnings_as_errors], |
122 | @@ -155,33 +187,7 @@ |
123 | _APPEND_COMPILE_FLAGS_ERROR([-Wundef]) |
124 | _APPEND_COMPILE_FLAGS_ERROR([-Wunsafe-loop-optimizations]) |
125 | _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations]) |
126 | - AS_IF([test "x$MINGW" != xyes],[ |
127 | - AS_IF([test "x$ac_cv_vcs_checkout" = xyes],[ |
128 | - AS_IF([test "x$enable_shared" = "xyes"],[ |
129 | - _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer]) |
130 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address]) |
131 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer]) |
132 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread]) |
133 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory]) |
134 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment]) |
135 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool]) |
136 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds]) |
137 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum]) |
138 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow]) |
139 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero]) |
140 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero]) |
141 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null]) |
142 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size]) |
143 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return]) |
144 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift]) |
145 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow]) |
146 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable]) |
147 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow]) |
148 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound]) |
149 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr]) |
150 | - ]) |
151 | - ]) |
152 | - ]) |
153 | + |
154 | _APPEND_COMPILE_FLAGS_ERROR([-Wclobbered]) |
155 | _APPEND_COMPILE_FLAGS_ERROR([-Wunused]) |
156 | _APPEND_COMPILE_FLAGS_ERROR([-Wunused-result]) |
157 | @@ -199,6 +205,8 @@ |
158 | # _APPEND_COMPILE_FLAGS_ERROR([-Wlong-long]) |
159 | _APPEND_COMPILE_FLAGS_ERROR([-Wunreachable-code]) |
160 | |
161 | + _SET_SANITIZE_FLAGS |
162 | + |
163 | AS_IF([test "x$ax_enable_debug" = xno], |
164 | [AS_IF([test "x$ac_cv_vcs_checkout" = xyes], |
165 | [AS_IF([test "x${target_os}" != "xmingw"], |
166 | @@ -282,33 +290,6 @@ |
167 | _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations]) |
168 | _APPEND_COMPILE_FLAGS_ERROR([-Wc++11-compat]) |
169 | # _APPEND_COMPILE_FLAGS_ERROR([-Weffc++]) |
170 | - AS_IF([test "x$MINGW" != xyes],[ |
171 | - AS_IF([test "x$ac_cv_vcs_checkout" = xyes],[ |
172 | - AS_IF([test "x$enable_shared" = "xyes"],[ |
173 | - _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer]) |
174 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address]) |
175 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer]) |
176 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread]) |
177 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory]) |
178 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment]) |
179 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool]) |
180 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds]) |
181 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum]) |
182 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow]) |
183 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero]) |
184 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero]) |
185 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null]) |
186 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size]) |
187 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return]) |
188 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift]) |
189 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow]) |
190 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable]) |
191 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow]) |
192 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound]) |
193 | - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr]) |
194 | - ]) |
195 | - ]) |
196 | - ]) |
197 | # _APPEND_COMPILE_FLAGS_ERROR([-Wold-style-cast]) |
198 | _APPEND_COMPILE_FLAGS_ERROR([-Wclobbered]) |
199 | _APPEND_COMPILE_FLAGS_ERROR([-Wunused]) |
200 | @@ -338,6 +319,8 @@ |
201 | _APPEND_COMPILE_FLAGS_ERROR([-fstack-protector-all]) |
202 | ])])])]) |
203 | |
204 | + _SET_SANITIZE_FLAGS |
205 | + |
206 | AS_IF([test "x$ac_cv_warnings_as_errors" = xyes], |
207 | [AX_APPEND_FLAG([-Werror])]) |
208 | AC_LANG_POP([C++]) |
209 | @@ -352,6 +335,7 @@ |
210 | AC_REQUIRE([AX_COMPILER_VERSION]) |
211 | AC_REQUIRE([AX_DEBUG]) |
212 | AC_REQUIRE([AX_VCS_CHECKOUT]) |
213 | + AC_REQUIRE([AX_HARDEN_SANITIZE]) |
214 | |
215 | AC_REQUIRE([gl_VISIBILITY]) |
216 | AS_IF([test -n "$CFLAG_VISIBILITY"],[CPPFLAGS="$CPPFLAGS $CFLAG_VISIBILITY"]) |
217 | @@ -360,3 +344,18 @@ |
218 | AC_REQUIRE([_HARDEN_CC_COMPILER_FLAGS]) |
219 | AC_REQUIRE([_HARDEN_CXX_COMPILER_FLAGS]) |
220 | ]) |
221 | + |
222 | +AC_DEFUN([AX_HARDEN_SANITIZE], |
223 | + [AC_REQUIRE([AX_DEBUG]) |
224 | + AC_ARG_WITH([sanitize], |
225 | + [AS_HELP_STRING([--with-sanitize], |
226 | + [Enable sanitize flag for compiler if it supports them @<:@default=no@:>@])], |
227 | + [AS_CASE([$with_sanitize], |
228 | + [thread],[ |
229 | + ax_harden_sanitize='thread'], |
230 | + [address],[ |
231 | + ax_harden_sanitize='with_sanitize'], |
232 | + [ax_harden_sanitize='rest']) |
233 | + ], |
234 | + [AS_IF([test "x$ax_enable_debug" = xyes],[ax_harden_sanitize='rest'])]) |
235 | + ]) |
236 | |
237 | === modified file 'm4/ax_prog_sphinx_build.m4' |
238 | --- m4/ax_prog_sphinx_build.m4 2013-05-11 11:15:03 +0000 |
239 | +++ m4/ax_prog_sphinx_build.m4 2013-06-17 20:42:29 +0000 |
240 | @@ -19,7 +19,7 @@ |
241 | # and this notice are preserved. This file is offered as-is, without any |
242 | # warranty. |
243 | |
244 | -#serial 4 |
245 | +#serial 5 |
246 | |
247 | AC_DEFUN([AX_PROG_SPHINX_BUILD], |
248 | [AX_WITH_PROG([SPHINXBUILD],[sphinx-build],[:]) |
249 | @@ -38,6 +38,7 @@ |
250 | AS_IF([test $? -eq 0], ,[SPHINXBUILD=]) |
251 | rm -rf conftest.d ]) |
252 | ]) |
253 | + rm -f version_file |
254 | ]) |
255 | |
256 | AS_IF([test -n "${SPHINXBUILD}"], |