diff options
| author | obrien <obrien@FreeBSD.org> | 2005-05-17 16:22:54 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2005-05-17 16:22:54 +0000 |
| commit | 41d069fd7003aac12f26e42e0e658590e2043bf9 (patch) | |
| tree | a31f39d2b6704f34d8521af0534ffb9239d3c0d7 /lib | |
| parent | 80ba7fc395d814c0c6a4abcaede237313e0455c1 (diff) | |
| download | FreeBSD-src-41d069fd7003aac12f26e42e0e658590e2043bf9.zip FreeBSD-src-41d069fd7003aac12f26e42e0e658590e2043bf9.tar.gz | |
Re-enable support for bzip2'ed compressed filesystems.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libstand/Makefile | 15 | ||||
| -rw-r--r-- | lib/libstand/bzipfs.c | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile index db0c384..594a948 100644 --- a/lib/libstand/Makefile +++ b/lib/libstand/Makefile @@ -45,7 +45,7 @@ SRCS+= strcasecmp.c SRCS+= htons.S ntohs.S htonl.S ntohl.S # string functions from libc -.PATH: ${.CURDIR}/../libc/string +.PATH: ${.CURDIR}/../libc/string .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "amd64" SRCS+= bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \ @@ -121,14 +121,19 @@ SRCS+= syncicache.c # _setjmp/_longjmp .if ${MACHINE_ARCH} == "amd64" -.PATH: ${.CURDIR}/i386 +.PATH: ${.CURDIR}/i386 .else -.PATH: ${.CURDIR}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/${MACHINE_ARCH} .endif SRCS+= _setjmp.S # decompression functionality from libz -.PATH: ${.CURDIR}/../libz +.PATH: ${.CURDIR}/../../contrib/bzip2 +CFLAGS+= -DBZ_NO_STDIO +SRCS+= bzlib.c crctable.c decompress.c huffman.c randtable.c + +# decompression functionality from libz +.PATH: ${.CURDIR}/../libz CFLAGS+=-DHAVE_MEMCPY -I${.CURDIR}/../libz SRCS+= adler32.c crc32.c _infback.c _inffast.c _inflate.c \ _inftrees.c _zutil.c _zutil.h @@ -159,7 +164,7 @@ SRCS+= arp.c ether.c inet_ntoa.c in_cksum.c net.c udp.c netif.c rpc.c SRCS+= bootp.c rarp.c bootparam.c # boot filesystems -SRCS+= ufs.c nfs.c cd9660.c tftp.c gzipfs.c # bzipfs.c +SRCS+= ufs.c nfs.c cd9660.c tftp.c gzipfs.c bzipfs.c SRCS+= dosfs.c ext2fs.c SRCS+= splitfs.c diff --git a/lib/libstand/bzipfs.c b/lib/libstand/bzipfs.c index 7f89b33..d4d3adf 100644 --- a/lib/libstand/bzipfs.c +++ b/lib/libstand/bzipfs.c @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/stat.h> #include <string.h> -#include <_bzlib.h> +#include <bzlib.h> #define BZ_BUFSIZE 2048 /* XXX larger? */ |
