diff options
author | Xin LI <delphij@FreeBSD.org> | 2012-06-21 21:47:08 +0000 |
---|---|---|
committer | Xin LI <delphij@FreeBSD.org> | 2012-06-21 21:47:08 +0000 |
commit | a2953f767d9013ac3d74d17da0a95fea7a7c1c0f (patch) | |
tree | 77406785fe7cd37081c5a9cabb2dc128be5b4716 /sys/boot | |
parent | 93af1bc41330b5d15edc1db4cac6f533059fcb1e (diff) | |
parent | 11598cceda4aa6b2db006d9dc3b7c80e9e727174 (diff) | |
download | src-a2953f767d9013ac3d74d17da0a95fea7a7c1c0f.tar.gz src-a2953f767d9013ac3d74d17da0a95fea7a7c1c0f.zip |
MFV: Update zlib to 1.2.7.
(x86 assembler optimization disabled for now because it
requires the new .cfi_* directives that is not supported
by base system binutils).
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=237410
Diffstat (limited to 'sys/boot')
-rw-r--r-- | sys/boot/userboot/libstand/Makefile | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sys/boot/userboot/libstand/Makefile b/sys/boot/userboot/libstand/Makefile index 7bb46388005b..fa54b016450d 100644 --- a/sys/boot/userboot/libstand/Makefile +++ b/sys/boot/userboot/libstand/Makefile @@ -42,7 +42,7 @@ CFLAGS+= -msoft-float -D_STANDALONE .endif # standalone components and stuff we have modified locally -SRCS+= zutil.h __main.c assert.c bcd.c bswap.c environment.c getopt.c gets.c \ +SRCS+= gzguts.h zutil.h __main.c assert.c bcd.c bswap.c environment.c getopt.c gets.c \ globals.c pager.c printf.c strdup.c strerror.c strtol.c random.c \ sbrk.c twiddle.c zalloc.c zalloc_malloc.c @@ -125,23 +125,28 @@ libstand_bzlib_private.h: bzlib_private.h # decompression functionality from libz .PATH: ${.CURDIR}/../../../../lib/libz CFLAGS+=-DHAVE_MEMCPY -I${.CURDIR}/../../../../lib/libz -SRCS+= adler32.c crc32.c libstand_zutil.h +SRCS+= adler32.c crc32.c libstand_zutil.h libstand_gzguts.h .for file in infback.c inffast.c inflate.c inftrees.c zutil.c SRCS+= _${file} CLEANFILES+= _${file} _${file}: ${file} - sed "s|zutil\.h|libstand_zutil.h|" ${.ALLSRC} > ${.TARGET} + sed -e "s|zutil\.h|libstand_zutil.h|" \ + -e "s|gzguts\.h|libstand_gzguts.h|" ${.ALLSRC} > ${.TARGET} .endfor # depend on stand.h being able to be included multiple times -CLEANFILES+= libstand_zutil.h -libstand_zutil.h: zutil.h - sed -e 's|<stddef.h>|"stand.h"|' \ +.for file in zutil.h gzguts.h +CLEANFILES+= libstand_${file} +libstand_${file}: ${file} + sed -e 's|<fcntl.h>|"stand.h"|' \ + -e 's|<stddef.h>|"stand.h"|' \ -e 's|<string.h>|"stand.h"|' \ + -e 's|<stdio.h>|"stand.h"|' \ -e 's|<stdlib.h>|"stand.h"|' \ ${.ALLSRC} > ${.TARGET} +.endfor # io routines SRCS+= closeall.c dev.c ioctl.c nullfs.c stat.c \ |