From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] dnsdist: Fix FTBFS with GCC 11
Date: Wed, 07 Jul 2021 20:18:29 +0000 [thread overview]
Message-ID: <20210707201829.12431-1-michael.tremer@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2208 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/dnsdist | 5 ++---
| 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 \
--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(a)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
--
2.20.1
reply other threads:[~2021-07-07 20:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210707201829.12431-1-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox