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

Following r226271, allow disabling lzma support with "WITHOUT_LZMA_SUPPORT".

Browse Source 
Correct r226271 which should have used WITHOUT_BZIP2_SUPPORT per r166255.

Obtained from:	Juniper Networks
This commit is contained in:
David E. O'Brien 2013-01-08 18:37:12 +00:00
parent 9f18a157e8
commit 9b6b681624
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=245171
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/build/make_check/Makefile
View File

@ -24,7 +24,7 @@ SMAKE= MAKEFLAGS= ${MAKE} -C ${.CURDIR}
all: all:
@echo '1..16' @echo '1..16'
@${SMAKE} C_check || { cd ${.CURDIR} ; ${MAKE} failure ; } @${SMAKE} C_check || { ${MAKE} -C ${.CURDIR} failure ; }
@echo "ok 1 - C_check # Test of -C flag existence detected no regression." @echo "ok 1 - C_check # Test of -C flag existence detected no regression."
@echo 1:${DATA1} 2:${DATA2} 3:${DATA3} 4:${DATA4} 5:${DATA5} | \ @echo 1:${DATA1} 2:${DATA2} 3:${DATA3} 4:${DATA4} 5:${DATA5} | \
diff -u ${.CURDIR}/regress.variables.out - || \ diff -u ${.CURDIR}/regress.variables.out - || \

2
tools/build/options/WITHOUT_LZMA_SUPPORT Normal file
View File

@ -0,0 +1,2 @@
.\" $FreeBSD$
Set to build some programs without optional lzma compression support.

15
usr.bin/grep/Makefile
View File

@ -40,17 +40,24 @@ MLINKS= grep.1 egrep.1 \
grep.1 lzfgrep.1 grep.1 lzfgrep.1
.endif .endif
LDADD= -lz
DPADD= ${LIBZ}
.if !defined(WITHOUT_LZMA_SUPPORT)
LDADD+= -llzma
DPADD+= ${LIBLZMA}
LINKS+= ${BINDIR}/${PROG} ${BINDIR}/xzgrep \ LINKS+= ${BINDIR}/${PROG} ${BINDIR}/xzgrep \
${BINDIR}/${PROG} ${BINDIR}/xzegrep \ ${BINDIR}/${PROG} ${BINDIR}/xzegrep \
${BINDIR}/${PROG} ${BINDIR}/xzfgrep \ ${BINDIR}/${PROG} ${BINDIR}/xzfgrep \
${BINDIR}/${PROG} ${BINDIR}/lzgrep \ ${BINDIR}/${PROG} ${BINDIR}/lzgrep \
${BINDIR}/${PROG} ${BINDIR}/lzegrep \ ${BINDIR}/${PROG} ${BINDIR}/lzegrep \
${BINDIR}/${PROG} ${BINDIR}/lzfgrep ${BINDIR}/${PROG} ${BINDIR}/lzfgrep
.else
CFLAGS+= -DWITHOUT_LZMA
.endif
LDADD= -lz -llzma .if !defined(WITHOUT_BZIP2_SUPPORT)
DPADD= ${LIBZ} ${LIBLZMA}
.if !defined(WITHOUT_BZIP2)
LDADD+= -lbz2 LDADD+= -lbz2
DPADD+= ${LIBBZ2} DPADD+= ${LIBBZ2}

9
usr.bin/grep/file.c
View File

@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <lzma.h>
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -50,6 +49,10 @@ __FBSDID("$FreeBSD$");
#include <wctype.h> #include <wctype.h>
#include <zlib.h> #include <zlib.h>
#ifndef WITHOUT_LZMA
#include <lzma.h>
#endif
#ifndef WITHOUT_BZIP2 #ifndef WITHOUT_BZIP2
#include <bzlib.h> #include <bzlib.h>
#endif #endif
@ -60,7 +63,9 @@ __FBSDID("$FreeBSD$");
#define LNBUFBUMP 80 #define LNBUFBUMP 80
static gzFile gzbufdesc; static gzFile gzbufdesc;
#ifndef WITHOUT_LZMA
static lzma_stream lstrm = LZMA_STREAM_INIT; static lzma_stream lstrm = LZMA_STREAM_INIT;
#endif
#ifndef WITHOUT_BZIP2 #ifndef WITHOUT_BZIP2
static BZFILE* bzbufdesc; static BZFILE* bzbufdesc;
#endif #endif
@ -116,6 +121,7 @@ grep_refill(struct file *f)
nr = -1; nr = -1;
} }
#endif #endif
#ifndef WITHOUT_LZMA
} else if ((filebehave == FILE_XZ) || (filebehave == FILE_LZMA)) { } else if ((filebehave == FILE_XZ) || (filebehave == FILE_LZMA)) {
lzma_action action = LZMA_RUN; lzma_action action = LZMA_RUN;
uint8_t in_buf[MAXBUFSIZ]; uint8_t in_buf[MAXBUFSIZ];
@ -146,6 +152,7 @@ grep_refill(struct file *f)
return (-1); return (-1);
bufrem = MAXBUFSIZ - lstrm.avail_out; bufrem = MAXBUFSIZ - lstrm.avail_out;
return (0); return (0);
#endif /* WIHTOUT_LZMA */
} else } else
nr = read(f->fd, buffer, MAXBUFSIZ); nr = read(f->fd, buffer, MAXBUFSIZ);