Index: usr.bin/ar/Makefile =================================================================== --- usr.bin/ar/Makefile (revision 207931) +++ usr.bin/ar/Makefile (working copy) @@ -3,8 +3,13 @@ PROG= ar SRCS= ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h +.if !defined(NO_LZMA) DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} ${LIBELF} LDADD= -larchive -lbz2 -lz -llzma -lelf +.else +DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBELF} +LDADD= -larchive -lbz2 -lz -lelf +.endif CFLAGS+=-I. -I${.CURDIR} Index: Makefile.inc1 =================================================================== --- Makefile.inc1 (revision 207931) +++ Makefile.inc1 (working copy) @@ -238,6 +238,9 @@ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF +.if ${OSRELDATE} < 900012 +BMAKE+= -DNO_LZMA +.endif # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \