Signed-off-by: Michael Tremer michael.tremer@ipfire.org --- lfs/dnsdist | 5 ++--- .../dnsdist-1.6.0-missing-mutex-header.patch | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 src/patches/dnsdist-1.6.0-missing-mutex-header.patch
diff --git a/lfs/dnsdist b/lfs/dnsdist index 5e110c5c9..96e775a37 100644 --- a/lfs/dnsdist +++ b/lfs/dnsdist @@ -31,14 +31,12 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -#SUP_ARCH = x86_64 -SUP_ARCH = none PROG = dnsdist PAK_VER = 9
DEPS =
-MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 2048))) +MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 2048 )))
############################################################################### # Top-level Rules @@ -81,6 +79,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/dnsdist-1.6.0-missing-mutex-header.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/src/patches/dnsdist-1.6.0-missing-mutex-header.patch b/src/patches/dnsdist-1.6.0-missing-mutex-header.patch new file mode 100644 index 000000000..8d9c97723 --- /dev/null +++ b/src/patches/dnsdist-1.6.0-missing-mutex-header.patch @@ -0,0 +1,22 @@ +From 65bb0ab32a449d8fb8cf9a4802d16ba4912d9fc4 Mon Sep 17 00:00:00 2001 +From: Remi Gacogne remi.gacogne@powerdns.com +Date: Tue, 25 May 2021 10:09:43 +0200 +Subject: [PATCH] dnsdist-1.6.x: Backport a missing mutex header + +--- + pdns/lock.hh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/pdns/lock.hh b/pdns/lock.hh +index 09299d7979d..0e88118c564 100644 +--- a/pdns/lock.hh ++++ b/pdns/lock.hh +@@ -20,6 +20,8 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #pragma once ++ ++#include <mutex> + #include <shared_mutex> + + class ReadWriteLock