From ae9f7248f91eae7a480964c9d546a42a11b95ec9 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 10 Nov 2017 07:52:58 +0000
Subject: [PATCH] rescue ipf: Remove hacks and link in libipf directly.

Sponsored by:	Dell EMC Isilon
---
 Makefile.inc1          | 3 +++
 rescue/rescue/Makefile | 1 +
 sbin/ipf/ipf/Makefile  | 5 +----
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index c5c176099973..45b8fe174394 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2396,6 +2396,9 @@ lib/libcasper__L: lib/libnv__L
 lib/liblzma__L: lib/libthr__L
 
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
+.if ${MK_IPFILTER} != "no"
+_generic_libs+=	sbin/ipf/libipf
+.endif
 .for _DIR in ${LOCAL_LIB_DIRS}
 .if exists(${.CURDIR}/${_DIR}/Makefile) && empty(_generic_libs:M${_DIR})
 _generic_libs+= ${_DIR}
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 06b5f3ff65fd..6618bf89b84c 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -108,6 +108,7 @@ CRUNCH_PROGS_sbin+= rtsol
 
 .if ${MK_IPFILTER} != "no"
 CRUNCH_PROGS_sbin+= ipf
+CRUNCH_LIBS_ipf+=	${LIBIPF}
 .endif
 
 .if ${MK_ROUTED} != "no"
diff --git a/sbin/ipf/ipf/Makefile b/sbin/ipf/ipf/Makefile
index 33eaaea32b1b..7e934ccc5984 100644
--- a/sbin/ipf/ipf/Makefile
+++ b/sbin/ipf/ipf/Makefile
@@ -30,10 +30,7 @@ ipf_l.h: lexer.h
 	sed -e 's/yy/ipf_yy/g' \
 	    ${.ALLSRC} > ${.TARGET}
 
-.if defined(RESCUE)
-LIBIPF_SRCS!=	cd ${.CURDIR:H}/libipf && ${MAKE} -V SRCS
-SRCS+=	${LIBIPF_SRCS}
-.else
+.if !defined(RESCUE)
 LIBADD+=	pcap
 .endif