svn commit: r325632 - in head: . rescue/rescue sbin/ipf/ipf

[Bryan Drewery]

Author: bdrewery
Date: Fri Nov 10 07:52:58 2017
New Revision: 325632
URL: https://svnweb.freebsd.org/changeset/base/325632

Log:
  rescue ipf: Remove hacks and link in libipf directly.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  head/Makefile.inc1
  head/rescue/rescue/Makefile
  head/sbin/ipf/ipf/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Nov 10 07:52:46 2017	(r325631)
+++ head/Makefile.inc1	Fri Nov 10 07:52:58 2017	(r325632)
@@ -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}

Modified: head/rescue/rescue/Makefile
==============================================================================
--- head/rescue/rescue/Makefile	Fri Nov 10 07:52:46 2017	(r325631)
+++ head/rescue/rescue/Makefile	Fri Nov 10 07:52:58 2017	(r325632)
@@ -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"

Modified: head/sbin/ipf/ipf/Makefile
==============================================================================
--- head/sbin/ipf/ipf/Makefile	Fri Nov 10 07:52:46 2017	(r325631)
+++ head/sbin/ipf/ipf/Makefile	Fri Nov 10 07:52:58 2017	(r325632)
@@ -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