From: JINMEI Tatuya Date: Fri, 28 Dec 2012 21:48:36 +0000 (+0000) Subject: [master] check werror_ok, not with_werror, in the Boost build failure check. X-Git-Tag: bind10-1.0.0-rc-release~95^2~21^2~8^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2aa422106dd081138c633ad2f9a3ede0ebdbd94a;p=thirdparty%2Fkea.git [master] check werror_ok, not with_werror, in the Boost build failure check. this is necessary to keep the previous behavior for FreeBSD where -Werror is automatically disabled due to other bug of the compiler. discussed on jabber, not seen a clear go, but I'm committing it at my discretion to fix the buildbot errors. I've confirmed the behavior on multiple FreeBSD boxes. --- diff --git a/configure.ac b/configure.ac index efb8d33d7e..a3fec10ee6 100644 --- a/configure.ac +++ b/configure.ac @@ -848,7 +848,7 @@ fi # There's a known bug in FreeBSD ports for Boost that would trigger a false # warning in build with g++ and -Werror (we exclude clang++ explicitly to # avoid unexpected false positives). -if test "$BOOST_NUMERIC_CAST_WOULDFAIL" = "yes" -a X"$with_werror" = X1 -a $CLANGPP = "no"; then +if test "$BOOST_NUMERIC_CAST_WOULDFAIL" = "yes" -a X"$werror_ok" = X1 -a $CLANGPP = "no"; then AC_MSG_ERROR([Failed to compile a required header file. If you are using FreeBSD and Boost installed via ports, retry with specifying --without-werror. See the ChangeLog entry for Trac no. 1991 for more details.]) fi