commit: 295a86b2494085c4125761afddc962d6a66ebc09 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Mon Aug 23 21:26:26 2021 +0000 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> CommitDate: Wed Aug 25 07:35:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=295a86b2
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 <AT> sartura.hr> Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org> net-misc/frr/files/frr-8.0-c-ares.patch | 19 +++++++++++++++++++ net-misc/frr/frr-8.0.ebuild | 5 ++++- 2 files changed, 23 insertions(+), 1 deletion(-) 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 00000000000..c313006e863 --- /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 57ef54e4692..6343f0f45e3 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
