Browse Source

Fix conflict between libnvpair and libnv when building rescue binaries.

Submitted by:	hselasky
Reviewed by:	jhb
Sponsored by:	NVIDIA Networking
MFC after:	3 weeks
Differential revision:	https://reviews.freebsd.org/D32551
main
Konstantin Belousov 4 months ago
parent
commit
3aaed4cb8c
  1. 16
      rescue/rescue/Makefile

16
rescue/rescue/Makefile

@ -137,8 +137,18 @@ CRUNCH_PROGS_usr.sbin+= zdb
CRUNCH_LIBS+= -l80211 -lalias -lcam -lncursesw -ldevstat -lipsec -llzma
.if ${MK_ZFS} != "no"
CRUNCH_LIBS+= -lavl -lzpool -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem
CRUNCH_LIBS+= -lbe -lzfsbootenv -lzutil -ltpool -lspl -licp_rescue
CRUNCH_LIBS+= -lavl -lpthread -luutil -lumem -ltpool -lspl
CRUNCH_LIBS_zfs+= ${LIBBE} \
${LIBZPOOL} \
${LIBZUTIL} \
${LIBZFS} \
${LIBZFS_CORE} \
${LIBZFSBOOTENV} \
${LIBICP_RESCUE} \
${LIBNVPAIR}
CRUNCH_LIBS_bectl+= ${CRUNCH_LIBS_zfs}
CRUNCH_LIBS_zpool+= ${CRUNCH_LIBS_zfs}
CRUNCH_LIBS_zdb+= ${CRUNCH_LIBS_zfs}
.else
# liblzma needs pthread
CRUNCH_LIBS+= -lpthread
@ -235,6 +245,8 @@ CRUNCH_ALIAS_chown= chgrp
CRUNCH_LIBS+= ${OBJTOP}/lib/libifconfig/libifconfig.a
CRUNCH_BUILDOPTS+= CRUNCH_CFLAGS+=-I${OBJTOP}/lib/libifconfig
CRUNCH_LIBS_ifconfig+= ${LIBNV}
CRUNCH_LIBS+= -lm
.if ${MK_ISCSI} != "no"

Loading…
Cancel
Save