diff options
| -rw-r--r-- | lib/libstand/Makefile | 23 | ||||
| -rw-r--r-- | lib/libstand/bzlib.c.diff | 58 | ||||
| -rw-r--r-- | lib/libstand/bzlib.h.diff | 15 | ||||
| -rw-r--r-- | lib/libstand/bzlib_private.h.diff | 22 |
4 files changed, 1 insertions, 117 deletions
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile index 0b961be..db0c384 100644 --- a/lib/libstand/Makefile +++ b/lib/libstand/Makefile @@ -127,27 +127,6 @@ SRCS+= syncicache.c .endif SRCS+= _setjmp.S -# decompression functionality from libbz2 -.PATH: ${.CURDIR}/../../contrib/bzip2 -CFLAGS+=-I. -DBZ_NO_STDIO -DBZ_NO_COMPRESS -SRCS+= _bzlib.c _crctable.c _decompress.c _huffman.c _randtable.c _bzlib.h \ - _bzlib_private.h - -# check your belt - ugly bzip2 stuff ahead -.for file in bzlib.c bzlib.h bzlib_private.h -CLEANFILES+= _${file} _${file}.orig - -_${file}: ${file} ${file}.diff - patch -s -b .orig -o ${.TARGET} < ${.ALLSRC:M*.diff} ${.ALLSRC:M*.[ch]} -.endfor - -.for file in crctable.c decompress.c huffman.c randtable.c -CLEANFILES+= _${file} - -_${file}: ${file} - sed "s|bzlib_private\.h|_bzlib_private.h|" ${.ALLSRC} > ${.TARGET} -.endfor - # decompression functionality from libz .PATH: ${.CURDIR}/../libz CFLAGS+=-DHAVE_MEMCPY -I${.CURDIR}/../libz @@ -180,7 +159,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/bzlib.c.diff b/lib/libstand/bzlib.c.diff deleted file mode 100644 index cbc800d..0000000 --- a/lib/libstand/bzlib.c.diff +++ /dev/null @@ -1,58 +0,0 @@ -$FreeBSD$ - -A patch to avoid linking into libstand compression routines from the bzip2 -that never being used anyway, while bloat loader(8) by additional 15KB. - ---- _bzlib.c 2001/09/13 12:20:50 1.1 -+++ _bzlib.c 2001/09/13 12:29:24 -@@ -73,8 +73,9 @@ - bzBuffToBuffDecompress. Fixed. - --*/ - --#include "bzlib_private.h" -+#include "_bzlib_private.h" - -+#ifndef BZ_NO_COMPRESS - - /*---------------------------------------------------*/ - /*--- Compression stuff ---*/ -@@ -130,6 +131,7 @@ - } - #endif - -+#endif /* BZ_NO_COMPRESS */ - - /*---------------------------------------------------*/ - static -@@ -156,6 +158,7 @@ - if (addr != NULL) free ( addr ); - } - -+#ifndef BZ_NO_COMPRESS - - /*---------------------------------------------------*/ - static -@@ -528,6 +531,7 @@ - return BZ_OK; - } - -+#endif /* BZ_NO_COMPRESS */ - - /*---------------------------------------------------*/ - /*--- Decompression stuff ---*/ -@@ -898,6 +902,7 @@ - return BZ_OK; - } - -+#ifndef BZ_NO_COMPRESS - - #ifndef BZ_NO_STDIO - /*---------------------------------------------------*/ -@@ -1587,6 +1592,7 @@ - } - #endif - -+#endif /* BZ_NO_COMPRESS */ - - /*-------------------------------------------------------------*/ - /*--- end bzlib.c ---*/ diff --git a/lib/libstand/bzlib.h.diff b/lib/libstand/bzlib.h.diff deleted file mode 100644 index ef6c4da..0000000 --- a/lib/libstand/bzlib.h.diff +++ /dev/null @@ -1,15 +0,0 @@ -$FreeBSD$ - ---- bzlib.h 2002/02/01 15:20:44 1.1 -+++ bzlib.h 2002/02/01 15:20:49 -@@ -110,8 +110,10 @@ - #define BZ_EXPORT - #endif - -+#ifndef BZ_NO_STDIO - /* Need a definitition for FILE */ - #include <stdio.h> -+#endif - - #ifdef _WIN32 - # include <windows.h> diff --git a/lib/libstand/bzlib_private.h.diff b/lib/libstand/bzlib_private.h.diff deleted file mode 100644 index 938ecad..0000000 --- a/lib/libstand/bzlib_private.h.diff +++ /dev/null @@ -1,22 +0,0 @@ -$FreeBSD$ - ---- bzlib_private.h 1 Feb 2002 16:26:19 -0000 1.1.1.2 -+++ bzlib_private.h 25 Apr 2003 03:55:07 -0000 -@@ -62,7 +62,7 @@ - #ifndef _BZLIB_PRIVATE_H - #define _BZLIB_PRIVATE_H - --#include <stdlib.h> -+#include "stand.h" - - #ifndef BZ_NO_STDIO - #include <stdio.h> -@@ -70,7 +70,7 @@ - #include <string.h> - #endif - --#include "bzlib.h" -+#include "_bzlib.h" - - - |
