From patchwork Wed Jul 7 20:18:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4493 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4GKrNG43zpz3xCm for ; Wed, 7 Jul 2021 20:18:38 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4GKrNF36s9z28R; Wed, 7 Jul 2021 20:18:37 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4GKrNF1GwXz2y4C; Wed, 7 Jul 2021 20:18:37 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4GKrND24bNz2xTN for ; Wed, 7 Jul 2021 20:18:36 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4GKrNC6DXDz15b; Wed, 7 Jul 2021 20:18:35 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1625689115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=LE/SJOG5k+FOnB9XKmuKGRXKzCMJn2LaMB1gCSAov5U=; b=EiVHrA6UOAofTSUCuF9oxA1IYXob0Pea/vSJfqIz1HZTL3xBEOT2rCWZB/xqfbS9skp4mf 3vL/AlD+QZaL+zCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1625689115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=LE/SJOG5k+FOnB9XKmuKGRXKzCMJn2LaMB1gCSAov5U=; b=pFUP6Z1eA804a+RlwJPz4ibLuls6qPCBH1YdBxxF1btqkdXDqd4/n8yPbVto2nPOQL/3kd 5Xc6okGL74ZFviKr1410wr9+NwP/DD9uvqq7r13EEeU/clUGLyxjBRk9YXknyTigZ5huwS mDGMShfe+5UIA3ma6iHyO28P3ym0foWkvn9iZD2OlB81FcxlS8qdIriqwzP8B3pA5AVDtS eFzQwdnOVrEQb412P7GBPZD6ahKGmk3BDhdMhyRJZUOGgBsu0YsnF3DiXLFAQbjvX9N/q/ FMl+AqEE8cd4W/cd/8AEYNIqVCMUoi38MCrBXszycaWMB8kaldSfz0HtN4Jt9A== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] dnsdist: Fix FTBFS with GCC 11 Date: Wed, 7 Jul 2021 20:18:29 +0000 Message-Id: <20210707201829.12431-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- 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 +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 + #include + + class ReadWriteLock