Merge lp://staging/~linuxjedi/libdrizzle/5.1-compiler-fixes into lp://staging/libdrizzle

Got it... So what is needed is a command line option for this.

Sent from my Ti85

On May 3, 2013, at 5:36, Andrew Hutchings <email address hidden> wrote:

> Andrew Hutchings has proposed merging lp:~linuxjedi/libdrizzle/5.1-compiler-fixes into lp:libdrizzle.
>
> Requested reviews:
> Drizzle Trunk (drizzle-trunk)
>
> For more details, see:
> https://code.launchpad.net/~linuxjedi/libdrizzle/5.1-compiler-fixes/+merge/162339
>
> The address sanitizer cannot be used at the same time as the thread sanitizer. CLang actually enforces this but for some reason GCC doesn't.
>
> When both are tried together the address sanitizer barfs on the thread sanitizer lib, I suspect this is due to the way it has to be linked.
>
> The address sanitizer is probably more useful to libdrizzle right now so disabling the thread sanitizer.
> --
> https://code.launchpad.net/~linuxjedi/libdrizzle/5.1-compiler-fixes/+merge/162339
> Your team Drizzle Trunk is requested to review the proposed merge of lp:~linuxjedi/libdrizzle/5.1-compiler-fixes into lp:libdrizzle.
> === modified file 'm4/ax_harden_compiler_flags.m4' --- m4/ax_harden_compiler_flags.m4 2013-04-29 06:10:51 +0000 +++ m4/ax_harden_compiler_flags.m4 2013-05-03 12:35:59 +0000 @@ -161,9 +161,9 @@ _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer]) _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address]) _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer]) - AS_IF([test "x$enable_shared" = "xyes"],[ - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread]) - ]) +# AS_IF([test "x$enable_shared" = "xyes"],[ +# _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread]) +# ]) _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory]) _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment]) _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool]) @@ -283,9 +283,9 @@ _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer]) _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address]) _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer]) - AS_IF([test "x$enable_shared" = "xyes"],[ - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread]) - ]) +# AS_IF([test "x$enable_shared" = "xyes"],[ +# _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread]) +# ]) _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory]) _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment]) _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])

yes, a command line option would probably work well. Also I sent you Skype messages as there are various problems with 4 of the Jenkins slaves