d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rescue ipf: Remove hacks and link in libipf directly.

Browse Source 
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Bryan Drewery 2017-11-10 07:52:58 +00:00
parent ff87c77cac
commit ae9f7248f9
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.inc1
View File

@ -2396,6 +2396,9 @@ lib/libcasper__L: lib/libnv__L
lib/liblzma__L: lib/libthr__L lib/liblzma__L: lib/libthr__L
_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib} _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} .for _DIR in ${LOCAL_LIB_DIRS}
.if exists(${.CURDIR}/${_DIR}/Makefile) && empty(_generic_libs:M${_DIR}) .if exists(${.CURDIR}/${_DIR}/Makefile) && empty(_generic_libs:M${_DIR})
_generic_libs+= ${_DIR} _generic_libs+= ${_DIR}

1
rescue/rescue/Makefile
View File

@ -108,6 +108,7 @@ CRUNCH_PROGS_sbin+= rtsol
.if ${MK_IPFILTER} != "no" .if ${MK_IPFILTER} != "no"
CRUNCH_PROGS_sbin+= ipf CRUNCH_PROGS_sbin+= ipf
CRUNCH_LIBS_ipf+= ${LIBIPF}
.endif .endif
.if ${MK_ROUTED} != "no" .if ${MK_ROUTED} != "no"

5
sbin/ipf/ipf/Makefile
View File

@ -30,10 +30,7 @@ ipf_l.h: lexer.h
sed -e 's/yy/ipf_yy/g' \ sed -e 's/yy/ipf_yy/g' \
${.ALLSRC} > ${.TARGET} ${.ALLSRC} > ${.TARGET}
.if defined(RESCUE) .if !defined(RESCUE)
LIBIPF_SRCS!= cd ${.CURDIR:H}/libipf && ${MAKE} -V SRCS
SRCS+= ${LIBIPF_SRCS}
.else
LIBADD+= pcap LIBADD+= pcap
.endif .endif