summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakov Smolic <jakov.smolic@sartura.hr>2021-08-23 23:26:26 +0200
committerSergey Popov <pinkbyte@gentoo.org>2021-08-25 10:35:36 +0300
commit295a86b2494085c4125761afddc962d6a66ebc09 (patch)
tree7a8cca73113b0ad4916a3d655e66d7239f7f3e9d /net-misc/frr
parentdev-util/clippy: Add missing virtual/libelf dependency (diff)
downloadgentoo-295a86b2494085c4125761afddc962d6a66ebc09.tar.gz
gentoo-295a86b2494085c4125761afddc962d6a66ebc09.tar.bz2
gentoo-295a86b2494085c4125761afddc962d6a66ebc09.zip
net-misc/frr: Fix broken c-ares detection
Closes: https://github.com/gentoo/gentoo/pull/22085 Closes: https://bugs.gentoo.org/809728 Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr> Signed-off-by: Sergey Popov <pinkbyte@gentoo.org>
Diffstat (limited to 'net-misc/frr')
-rw-r--r--net-misc/frr/files/frr-8.0-c-ares.patch19
-rw-r--r--net-misc/frr/frr-8.0.ebuild5
2 files changed, 23 insertions, 1 deletions
diff --git a/net-misc/frr/files/frr-8.0-c-ares.patch b/net-misc/frr/files/frr-8.0-c-ares.patch
new file mode 100644
index 000000000000..c313006e8630
--- /dev/null
+++ b/net-misc/frr/files/frr-8.0-c-ares.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/809728
+--- a/lib/subdir.am
++++ b/lib/subdir.am
+@@ -144,7 +144,6 @@ vtysh_scan += \
+ lib/log_vty.c \
+ lib/nexthop_group.c \
+ lib/plist.c \
+- lib/resolver.c \
+ lib/routemap.c \
+ lib/routemap_cli.c \
+ lib/spf_backoff.c \
+@@ -333,6 +332,7 @@ lib_libfrrsnmp_la_SOURCES = \
+ if CARES
+ lib_LTLIBRARIES += lib/libfrrcares.la
+ pkginclude_HEADERS += lib/resolver.h
++vtysh_scan += lib/resolver.c
+ endif
+
+ lib_libfrrcares_la_CFLAGS = $(AM_CFLAGS) $(CARES_CFLAGS)
diff --git a/net-misc/frr/frr-8.0.ebuild b/net-misc/frr/frr-8.0.ebuild
index 57ef54e4692d..6343f0f45e38 100644
--- a/net-misc/frr/frr-8.0.ebuild
+++ b/net-misc/frr/frr-8.0.ebuild
@@ -49,7 +49,10 @@ RDEPEND="
!net-misc/quagga
"
-PATCHES=( "${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
+ "${FILESDIR}"/${P}-c-ares.patch
+)
src_prepare() {
default