Sun Aug 10 06:51:45 2014 UTC ()
Rebase.


(tls)
diff -r1.17 -r1.17.8.1 src/lib/libbz2/Makefile
cvs diff -r1.17 -r1.17.8.1 src/lib/libbz2/Makefile (expand / switch to unified diff)

--- src/lib/libbz2/Makefile 2012/05/07 08:51:47 1.17
+++ src/lib/libbz2/Makefile 2014/08/10 06:51:45 1.17.8.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.17 2012/05/07 08:51:47 wiz Exp $ 1# $NetBSD: Makefile,v 1.17.8.1 2014/08/10 06:51:45 tls Exp $
2 2
3USE_FORT?= yes # data driven bugs? 3USE_FORT?= yes # data driven bugs?
4 4
5NOMAN= # defined 5NOMAN= # defined
6 6
7.include <bsd.own.mk> 7.include <bsd.own.mk>
8 8
9LIB= bz2 9LIB= bz2
10DIST= ${NETBSDSRCDIR}/external/bsd/bzip2/dist 10DIST= ${NETBSDSRCDIR}/external/bsd/bzip2/dist
11.PATH: ${DIST} 11.PATH: ${DIST}
12 12
13SRCS= blocksort.c huffman.c crctable.c randtable.c compress.c \ 13SRCS= blocksort.c huffman.c crctable.c randtable.c compress.c \
14 decompress.c bzlib.c 14 decompress.c bzlib.c
@@ -17,19 +17,19 @@ INCSDIR= /usr/include @@ -17,19 +17,19 @@ INCSDIR= /usr/include
17 17
18# XXX huffman.c gets mis-compiled with 2.95.3 18# XXX huffman.c gets mis-compiled with 2.95.3
19.if ${MACHINE_ARCH} == "vax" 19.if ${MACHINE_ARCH} == "vax"
20COPTS+= -O0 20COPTS+= -O0
21.endif 21.endif
22 22
23# XXX blocksort.c gets mis-compiled with 4.1 23# XXX blocksort.c gets mis-compiled with 4.1
24.if (${MACHINE_ARCH} == "sh3el" || ${MACHINE_ARCH} == "sh3eb") && \ 24.if (${MACHINE_ARCH} == "sh3el" || ${MACHINE_ARCH} == "sh3eb") && \
25 defined(HAVE_GCC) 25 defined(HAVE_GCC)
26COPTS.blocksort.c+= -fno-loop-optimize 26COPTS.blocksort.c+= -fno-loop-optimize
27.endif 27.endif
28 28
29.if ${MKSHARE} != "no" 29.if ${MKSHARE} != "no"
30FILESDIR= ${HTMLDOCDIR}/bzip2 30FILESDIR= /usr/share/doc/reference/ref1/bzip2
31FILES= manual.html 31FILES= manual.html
32.endif 32.endif
33 33
34.include <bsd.info.mk> 34.include <bsd.info.mk>
35.include <bsd.lib.mk> 35.include <bsd.lib.mk>