Merge lp:~brianaker/gearmand/m4-updates-june into lp:gearmand

[Brian Aker]

[lp:~brianaker/gearmand/m4-updates-june]

780. By Brian Aker on 2013-06-17

Fix case where we are not passing warnings.`

=== modified file '.bzrignore'
--- .bzrignore	2013-06-06 22:48:07 +0000
+++ .bzrignore	2013-06-17 20:42:29 +0000
@@ -47,3 +47,72 @@
 tests/worker_test
 valgrind*xml
 cmd*xml
+*.log
+*.trs
+*.lo
+*.la
+man/*.1
+man/*.3
+man/*.8
+man/.doctrees/
+gearmand/gearmand
+gearmand/hostile_gearmand
+libgearman-1.0/t/c_test
+libgearman-1.0/t/cc_test
+libhostile/t/accept
+libhostile/t/close
+libhostile/t/hostile_accept
+libhostile/t/hostile_close
+libhostile/t/hostile_pipe
+libhostile/t/hostile_pipe2
+libhostile/t/pipe
+libhostile/t/pipe2
+libtest/abort
+libtest/backtrace
+libtest/core-count
+libtest/skiptest
+libtest/unittest
+libtest/wait
+tests/blobslap_client
+tests/c_test
+tests/cli
+tests/cpp_test
+tests/cycle
+tests/drizzle_test
+tests/ephemeral_test
+tests/gearmand
+tests/hostile_gearmand
+tests/hostile_libgearman
+tests/httpd_test
+tests/memcached_test
+tests/mysql_test
+tests/postgres_test
+tests/redis_test
+tests/result
+tests/round_robin_test
+tests/sqlite_test
+tests/stress
+tests/tokyocabinet_test
+tests/vector
+tests/libgearman-1.0/1077917
+tests/libgearman-1.0/client_test
+tests/libgearman-1.0/internals_test
+tests/libgearman-1.0/multi_client_test
+tests/libgearman-1.0/worker_test
+benchmark/blobslap_client
+benchmark/blobslap_worker
+bin/gearadmin
+bin/gearman
+docs/libgearman/examples/gearman_client_do_background_example
+docs/libgearman/examples/gearman_client_do_example
+docs/libgearman/examples/gearman_execute_example
+docs/libgearman/examples/gearman_execute_partition
+examples/echo_client
+examples/echo_worker
+examples/reverse_client
+examples/reverse_client_bg
+examples/reverse_client_cb
+examples/reverse_client_epoch
+examples/reverse_worker
+examples/wc_worker
+tmp_chroot
 
=== modified file 'm4/ax_harden_compiler_flags.m4'
--- m4/ax_harden_compiler_flags.m4	2013-04-29 15:09:13 +0000
+++ m4/ax_harden_compiler_flags.m4	2013-06-17 20:42:29 +0000
@@ -53,7 +53,39 @@
 # -Wdeclaration-after-statement is counter to C99
 # _APPEND_COMPILE_FLAGS_ERROR([-pedantic])
 
-#serial 10
+#serial 11
+
+AC_DEFUN([_SET_SANITIZE_FLAGS],
+         [AS_IF([test "x$MINGW" != xyes],[
+                AS_IF([test "x$enable_shared" = "xyes"],
+                      [AS_CASE([$ax_harden_sanitize],
+                               [thread],[
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])],
+                               [address],[
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])],
+                               [rest],[
+                               _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])])
+                      ])
+                ])
+          ])
 
 AC_DEFUN([_WARNINGS_AS_ERRORS],
     [AC_CACHE_CHECK([if all warnings into errors],[ac_cv_warnings_as_errors],
@@ -155,33 +187,7 @@
           _APPEND_COMPILE_FLAGS_ERROR([-Wundef])
           _APPEND_COMPILE_FLAGS_ERROR([-Wunsafe-loop-optimizations])
           _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations])
-          AS_IF([test "x$MINGW" != xyes],[
-            AS_IF([test "x$ac_cv_vcs_checkout" = xyes],[
-              AS_IF([test "x$enable_shared" = "xyes"],[
-                _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
-              ])
-            ])
-          ])
+
           _APPEND_COMPILE_FLAGS_ERROR([-Wclobbered])
           _APPEND_COMPILE_FLAGS_ERROR([-Wunused])
           _APPEND_COMPILE_FLAGS_ERROR([-Wunused-result])
@@ -199,6 +205,8 @@
 #         _APPEND_COMPILE_FLAGS_ERROR([-Wlong-long])
           _APPEND_COMPILE_FLAGS_ERROR([-Wunreachable-code])
 
+          _SET_SANITIZE_FLAGS
+
           AS_IF([test "x$ax_enable_debug" = xno],
             [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
               [AS_IF([test "x${target_os}" != "xmingw"],
@@ -282,33 +290,6 @@
           _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations])
           _APPEND_COMPILE_FLAGS_ERROR([-Wc++11-compat])
 #         _APPEND_COMPILE_FLAGS_ERROR([-Weffc++])
-          AS_IF([test "x$MINGW" != xyes],[
-            AS_IF([test "x$ac_cv_vcs_checkout" = xyes],[
-              AS_IF([test "x$enable_shared" = "xyes"],[
-                _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
-                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
-              ])
-            ])
-          ])
 #         _APPEND_COMPILE_FLAGS_ERROR([-Wold-style-cast])
           _APPEND_COMPILE_FLAGS_ERROR([-Wclobbered])
           _APPEND_COMPILE_FLAGS_ERROR([-Wunused])
@@ -338,6 +319,8 @@
                 _APPEND_COMPILE_FLAGS_ERROR([-fstack-protector-all])
                 ])])])])
 
+          _SET_SANITIZE_FLAGS
+
           AS_IF([test "x$ac_cv_warnings_as_errors" = xyes],
                 [AX_APPEND_FLAG([-Werror])])
           AC_LANG_POP([C++])
@@ -352,6 +335,7 @@
            AC_REQUIRE([AX_COMPILER_VERSION])
            AC_REQUIRE([AX_DEBUG])
            AC_REQUIRE([AX_VCS_CHECKOUT])
+           AC_REQUIRE([AX_HARDEN_SANITIZE])
 
            AC_REQUIRE([gl_VISIBILITY])
            AS_IF([test -n "$CFLAG_VISIBILITY"],[CPPFLAGS="$CPPFLAGS $CFLAG_VISIBILITY"])
@@ -360,3 +344,18 @@
            AC_REQUIRE([_HARDEN_CC_COMPILER_FLAGS])
            AC_REQUIRE([_HARDEN_CXX_COMPILER_FLAGS])
            ])
+
+AC_DEFUN([AX_HARDEN_SANITIZE],
+         [AC_REQUIRE([AX_DEBUG])
+         AC_ARG_WITH([sanitize],
+                     [AS_HELP_STRING([--with-sanitize],
+                                     [Enable sanitize flag for compiler if it supports them @<:@default=no@:>@])],
+                     [AS_CASE([$with_sanitize],
+                              [thread],[
+                              ax_harden_sanitize='thread'],
+                              [address],[
+                              ax_harden_sanitize='with_sanitize'],
+                              [ax_harden_sanitize='rest'])
+                     ],
+                     [AS_IF([test "x$ax_enable_debug" = xyes],[ax_harden_sanitize='rest'])])
+         ])
 
=== modified file 'm4/ax_prog_sphinx_build.m4'
--- m4/ax_prog_sphinx_build.m4	2013-05-11 11:15:03 +0000
+++ m4/ax_prog_sphinx_build.m4	2013-06-17 20:42:29 +0000
@@ -19,7 +19,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 4
+#serial 5
 
 AC_DEFUN([AX_PROG_SPHINX_BUILD],
          [AX_WITH_PROG([SPHINXBUILD],[sphinx-build],[:])
@@ -38,6 +38,7 @@
                             AS_IF([test $? -eq 0], ,[SPHINXBUILD=])
                             rm -rf conftest.d ])
                       ])
+                      rm -f version_file
                ])
 
          AS_IF([test -n "${SPHINXBUILD}"],