From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 23 Apr 2021 13:40:43 +0000 (+0200)
Subject: boost 1.76 containers: use standard exceptions
X-Git-Tag: rec-4.5.0-rc1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10335%2Fhead;p=thirdparty%2Fpdns.git

boost 1.76 containers: use standard exceptions

(cherry picked from commit 311f26839819062ced8697686372b6c6b2210bdf)
---

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 975a129722..9e26e7798a 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -7,7 +7,8 @@ AM_CPPFLAGS += \
 	$(LIBCRYPTO_INCLUDES) \
 	$(SYSTEMD_CFLAGS) \
 	$(YAML_CFLAGS) \
-	-I$(top_srcdir)/ext/protozero/include
+	-I$(top_srcdir)/ext/protozero/include \
+	-DBOOST_CONTAINER_USE_STD_EXCEPTIONS
 
 AM_CXXFLAGS = \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index e56c07e263..23be736d3d 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -7,7 +7,8 @@ AM_CPPFLAGS += $(SYSTEMD_CFLAGS) \
 	$(NET_SNMP_CFLAGS) \
 	$(LIBCAP_CFLAGS) \
 	-I$(top_srcdir)/ext/protozero/include \
-	-DSYSCONFDIR=\"${sysconfdir}\"
+	-DSYSCONFDIR=\"${sysconfdir}\" \
+	-DBOOST_CONTAINER_USE_STD_EXCEPTIONS
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 64e3c8f9d4..bd39f48fe5 100644
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -7,7 +7,8 @@ AM_CPPFLAGS += \
 	-I$(top_srcdir)/ext/json11 \
 	-I$(top_srcdir)/ext/protozero/include \
 	$(YAHTTP_CFLAGS) \
-	$(LIBCRYPTO_INCLUDES)
+	$(LIBCRYPTO_INCLUDES) \
+	-DBOOST_CONTAINER_USE_STD_EXCEPTIONS
 
 AM_CXXFLAGS = \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \