summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArsen Arsenović <arsen@gentoo.org>2023-04-19 02:10:57 +0200
committerArsen Arsenović <arsen@gentoo.org>2023-04-19 02:19:00 +0200
commit61450918ac12732055abb52082fba09837abab8e (patch)
treee314f3af84385ff7224d186739915e0f98f50cca /net-dns
parentdev-lang/jsonnet: add 0.20.0 (diff)
downloadgentoo-61450918ac12732055abb52082fba09837abab8e.tar.gz
gentoo-61450918ac12732055abb52082fba09837abab8e.tar.bz2
gentoo-61450918ac12732055abb52082fba09837abab8e.zip
net-dns/dnsdist: Fix building on GCC 13
Closes: https://bugs.gentoo.org/895094 Signed-off-by: Arsen Arsenović <arsen@gentoo.org>
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild4
-rw-r--r--net-dns/dnsdist/files/dnsdist-1.7.3-gcc13.patch62
2 files changed, 66 insertions, 0 deletions
diff --git a/net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild b/net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild
index c0ec5088ac0e..72f5311ffcfb 100644
--- a/net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild
@@ -45,6 +45,10 @@ RDEPEND="acct-group/dnsdist
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}"/"${PN}"-1.7.3-gcc13.patch
+)
+
src_configure() {
# bug #822855
append-lfs-flags
diff --git a/net-dns/dnsdist/files/dnsdist-1.7.3-gcc13.patch b/net-dns/dnsdist/files/dnsdist-1.7.3-gcc13.patch
new file mode 100644
index 000000000000..339887ca4a19
--- /dev/null
+++ b/net-dns/dnsdist/files/dnsdist-1.7.3-gcc13.patch
@@ -0,0 +1,62 @@
+Altered slightly from upstream counterparts in order to make them apply to
+the dist tarball (updated context and filenames to match the dist).
+
+https://github.com/PowerDNS/pdns/commit/f407319cb7374baf06698786f4f39d431a36a3cc
+https://github.com/PowerDNS/pdns/commit/d8b4ea24dc5dbe7c53c24bfffba24bcae7f58e02
+
+From d8b4ea24dc5dbe7c53c24bfffba24bcae7f58e02 Mon Sep 17 00:00:00 2001
+From: Peter van Dijk <peter.van.dijk@powerdns.com>
+Date: Mon, 23 Jan 2023 14:54:09 +0100
+Subject: [PATCH] lock.hh: include <stdexcept>
+
+---
+ pdns/lock.hh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pdns/lock.hh b/pdns/lock.hh
+index e8bd82988da..a08951a266d 100644
+--- a/lock.hh
++++ b/lock.hh
+@@ -22,6 +22,7 @@
+ #pragma once
+ #include <mutex>
+ #include <shared_mutex>
++#include <stdexcept>
+
+ /*
+ This file provides several features around locks:
+From f407319cb7374baf06698786f4f39d431a36a3cc Mon Sep 17 00:00:00 2001
+From: Sander Hoentjen <shoentjen@antagonist.nl>
+Date: Mon, 20 Feb 2023 16:51:07 +0100
+Subject: [PATCH] dnsdist-protocols.hh: include <cstdint>
+
+This fixes building dnsdist with gcc13:
+```
+In file included from dnsdist-protocols.cc:26:
+dnsdist-protocols.hh:32:8: error: use of enum 'typeenum' without previous declaration
+ 32 | enum typeenum : uint8_t
+ | ^~~~~~~~
+dnsdist-protocols.hh:32:19: error: 'uint8_t' was not declared in this scope
+ 32 | enum typeenum : uint8_t
+ | ^~~~~~~
+dnsdist-protocols.hh:25:1: note: 'uint8_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
+ 24 | #include <vector>
+ +++ |+#include <cstdint>
+ 25 | #include <string>
+```
+---
+ pdns/dnsdist-protocols.hh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pdns/dnsdist-protocols.hh b/pdns/dnsdist-protocols.hh
+index c5c5743908d..bd2a4bb8ad1 100644
+--- a/dnsdist-protocols.hh
++++ b/dnsdist-protocols.hh
+@@ -22,6 +22,7 @@
+ #pragma once
+
+ #include <vector>
++#include <cstdint>
+ #include <string>
+
+ namespace dnsdist