From: Michael Pratt <mcpratt@pm.me>
Date: Tue, 18 Jun 2024 02:17:06 +0000 (-0400)
Subject: frr: link zlib in host build
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=a185c7fabe2442d6a65a3735ffe5d3a08afa021a;p=feed%2Fpackages.git

frr: link zlib in host build

Due to changes in elfutils in order to
simplify the build for static libraries only,
the zlib functions that libelf depends on
are no longer linked within the static libelf library.

If frr were to use pkg-config, no change would be necessary,
however, the AC_CHECK_LIB macro is used, so add the link manually.

Signed-off-by: Michael Pratt <mcpratt@pm.me>
---

diff --git a/net/frr/Makefile b/net/frr/Makefile
index 41ae44bc12..40cdd200e4 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -164,6 +164,9 @@ HOST_CPPFLAGS += -I$(STAGING_DIR_HOST)/include/libelf
 HOST_CONFIGURE_ARGS+= \
 	--enable-clippy-only
 
+HOST_MAKE_FLAGS = \
+        LIBS+='-lz'
+
 define Host/Install
 	$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin
 	$(INSTALL_BIN) $(HOST_BUILD_DIR)/lib/clippy $(STAGING_DIR_HOSTPKG)/bin/