From 42cec1e5948e828fb2b941107c4fce9ec847f9a8 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Fri, 23 Apr 2021 15:40:43 +0200 Subject: [PATCH] boost 1.76 containers: use standard exceptions (cherry picked from commit 311f26839819062ced8697686372b6c6b2210bdf) --- pdns/Makefile.am | 3 ++- pdns/dnsdistdist/Makefile.am | 2 +- pdns/recursordist/Makefile.am | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pdns/Makefile.am b/pdns/Makefile.am index 237a48f501..f073f05260 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -6,7 +6,8 @@ AM_CPPFLAGS += \ $(LIBEDIT_CFLAGS) \ $(LIBCRYPTO_INCLUDES) \ $(SYSTEMD_CFLAGS) \ - $(YAML_CFLAGS) + $(YAML_CFLAGS) \ + -DBOOST_CONTAINER_USE_STD_EXCEPTIONS AM_CXXFLAGS = \ -DSYSCONFDIR=\"$(sysconfdir)\" \ diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am index b0ca67ad42..7143be30e3 100644 --- a/pdns/dnsdistdist/Makefile.am +++ b/pdns/dnsdistdist/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS += $(SYSTEMD_CFLAGS) $(LUA_CFLAGS) $(LIBEDIT_CFLAGS) $(LIBSODIUM_CFLAGS) $(FSTRM_CFLAGS) $(YAHTTP_CFLAGS) $(SANITIZER_FLAGS) $(NET_SNMP_CFLAGS) $(LIBCAP_CFLAGS) -DSYSCONFDIR=\"${sysconfdir}\" +AM_CPPFLAGS += $(SYSTEMD_CFLAGS) $(LUA_CFLAGS) $(LIBEDIT_CFLAGS) $(LIBSODIUM_CFLAGS) $(FSTRM_CFLAGS) $(YAHTTP_CFLAGS) $(SANITIZER_FLAGS) $(NET_SNMP_CFLAGS) $(LIBCAP_CFLAGS) -DSYSCONFDIR=\"${sysconfdir}\" -DBOOST_CONTAINER_USE_STD_EXCEPTIONS ACLOCAL_AMFLAGS = -I m4 diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am index e7e437c083..036bdccd81 100644 --- a/pdns/recursordist/Makefile.am +++ b/pdns/recursordist/Makefile.am @@ -6,7 +6,8 @@ AM_CPPFLAGS = $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) $(LIBSODIUM_CFLAG AM_CPPFLAGS += \ -I$(top_srcdir)/ext/json11 \ $(YAHTTP_CFLAGS) \ - $(LIBCRYPTO_INCLUDES) + $(LIBCRYPTO_INCLUDES) \ + -DBOOST_CONTAINER_USE_STD_EXCEPTIONS AM_CXXFLAGS = \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -- 2.47.2