BIND 10 trac3025, updated. 9c88046f2b021dded1981966b930029e765b5915 [3025] Abort with shared memory & old boost

[BIND 10 source code commits]

The branch, trac3025 has been updated
  discards  3aae90d94587f0ac3dd1910bd2ce9b2e4d678a8d (commit)
       via  9c88046f2b021dded1981966b930029e765b5915 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (3aae90d94587f0ac3dd1910bd2ce9b2e4d678a8d)
            \
             N -- N -- N (9c88046f2b021dded1981966b930029e765b5915)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9c88046f2b021dded1981966b930029e765b5915
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Aug 7 12:50:52 2013 +0200

    [3025] Abort with shared memory & old boost
    
    After trying to persuade automake to disable optimisations selectively
    on the library or object file and trying desperate ways like
    https://lists.gnu.org/archive/html/automake/2006-09/msg00038.html,
    it produced a different kind of segfault with that version of boost.
    It's likely that part of boost was not matured in that version yet, so
    require new boost for the shared memory support.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac             |   18 +++++++++---------
 src/lib/util/Makefile.am |    7 -------
 2 files changed, 9 insertions(+), 16 deletions(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index f0c97eb..a6278c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -898,8 +898,6 @@ if test "$BOOST_NUMERIC_CAST_WOULDFAIL" = "yes" -a X"$werror_ok" = X1 -a $CLANGP
     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
 
-AM_CONDITIONAL([BOOST_RBTREE_OLD], [test x$boost_rbtree_old = xyes])
-
 use_shared_memory=yes
 AC_ARG_WITH(shared-memory,
     AC_HELP_STRING([--with-shared-memory],
@@ -914,6 +912,15 @@ if test "x$use_shared_memory" = "xyes"; then
 fi
 AC_SUBST(BOOST_MAPPED_FILE_CXXFLAG)
 
+if test "$BOOST_RBTREE_OLD" = "yes" -a "$use_shared_memory" = "yes" ; then
+    AC_MSG_ERROR([You're trying to compile against boost older than 1.48 with
+shared memory. This is known to cause problems under certain situations.
+
+Either update boost to newer version or use --without-shared-memory.
+Note that most users likely don't need shared memory support.
+])
+fi
+
 # Add some default CPP flags needed for Boost, identified by the AX macro.
 CPPFLAGS="$CPPFLAGS $CPPFLAGS_BOOST_THREADCONF"
 
@@ -1536,13 +1543,6 @@ cat >> config.report << END
 END
 fi
 
-if test "$BOOST_RBTREE_OLD" = "yes" ; then
-cat >> config.report << END
-Warning: Compiling part of the source code without optimisations due to
-  old version of boost. Use at least 1.48 if this is a problem.
-END
-fi
-
 cat >> config.report << END
 
 Features:
diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
index 1cf93fa..ff5ef40 100644
--- a/src/lib/util/Makefile.am
+++ b/src/lib/util/Makefile.am
@@ -17,13 +17,6 @@ AM_CXXFLAGS = $(B10_CXXFLAGS)
 if USE_SHARED_MEMORY
 AM_CXXFLAGS += $(BOOST_MAPPED_FILE_CXXFLAG)
 endif
-# Workaround for old version of boost. It breaks with certain versions
-# of GCC and optimisations turned on. As this is rare by itself and it is
-# for rather old version that'll get rarer and rarer, we just don't bother
-# to do it per-object-file (as that's hard with automake).
-if BOOST_RBTREE_OLD
-AM_CXXFLAGS += -O0
-endif
 
 lib_LTLIBRARIES = libb10-util.la
 libb10_util_la_SOURCES  = filename.h filename.cc