diff options
| author | sobomax <sobomax@FreeBSD.org> | 2005-05-29 21:56:38 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2005-05-29 21:56:38 +0000 |
| commit | eb9b77e827444a8bfd2e0580489e73b02fe751e8 (patch) | |
| tree | b2d4afca03b74bbefeee45484453f9cdfd78d2d7 /lib/libstand | |
| parent | 404d37a14dc9215307de2ad21dd3a38744d3ccf5 (diff) | |
| download | FreeBSD-src-eb9b77e827444a8bfd2e0580489e73b02fe751e8.zip FreeBSD-src-eb9b77e827444a8bfd2e0580489e73b02fe751e8.tar.gz | |
Make bzip2 support working again after bzip2 upgrade. This time commit
BZ_NO_COMPRESS support to the bzip2 sources directly (yes, this takes file
off the vendor branch, but looks like bzip2 maintainer doesn't care), so that
it will not be removed when the next upgrade is performed. Also, add a short
note on how to test bzip2 support.
Pointy hat to: obrien
Correct comment (libz -> libbz2) and remove useless full path to zutil.h
while I am here.
Diffstat (limited to 'lib/libstand')
| -rw-r--r-- | lib/libstand/Makefile | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile index 9fe1d39..f95a43a 100644 --- a/lib/libstand/Makefile +++ b/lib/libstand/Makefile @@ -127,10 +127,25 @@ SRCS+= syncicache.c .endif SRCS+= _setjmp.S -# decompression functionality from libz +# decompression functionality from libbz2 +# NOTE: to actually test this functionality after libbz2 upgrade compile +# loader(8) with LOADER_BZIP2_SUPPORT defined .PATH: ${.CURDIR}/../../contrib/bzip2 -CFLAGS+= -DBZ_NO_STDIO -I${.CURDIR}/../../contrib/bzip2 -SRCS+= bzlib.c crctable.c decompress.c huffman.c randtable.c +CFLAGS+= -DBZ_NO_STDIO -DBZ_NO_COMPRESS -I${.CURDIR}/../../contrib/bzip2 +SRCS+= libstand_bzlib_private.h + +.for file in bzlib.c crctable.c decompress.c huffman.c randtable.c +SRCS+= _${file} +CLEANFILES+= _${file} + +_${file}: ${file} + sed "s|bzlib_private\.h|libstand_bzlib_private.h|" ${.ALLSRC} > ${.TARGET} +.endfor + +CLEANFILES+= libstand_bzlib_private.h +libstand_bzlib_private.h: bzlib_private.h + sed -e 's|<stdlib.h>|"stand.h"|' \ + ${.ALLSRC} > ${.TARGET} # decompression functionality from libz .PATH: ${.CURDIR}/../libz @@ -147,7 +162,7 @@ _${file}: ${file} # depend on stand.h being able to be included multiple times CLEANFILES+= libstand_zutil.h -libstand_zutil.h: ${.CURDIR}/../libz/zutil.h +libstand_zutil.h: zutil.h sed -e 's|<stddef.h>|"stand.h"|' \ -e 's|<string.h>|"stand.h"|' \ -e 's|<stdlib.h>|"stand.h"|' \ |
