svn commit: r208169 - head/lib/libarchive
Giorgos Keramidas
keramida at ceid.upatras.gr
Mon May 17 01:20:50 UTC 2010
On Sun, 16 May 2010 20:43:17 +0000 (UTC), Tim Kientzle <kientzle at FreeBSD.org> wrote:
> Author: kientzle
> Date: Sun May 16 20:43:17 2010
> New Revision: 208169
> URL: http://svn.freebsd.org/changeset/base/208169
>
> Log:
> Reorganize slightly in preparation for making lzma and bz2 support conditional.
>
> Modified:
> head/lib/libarchive/Makefile
> head/lib/libarchive/config_freebsd.h
>
> Modified: head/lib/libarchive/Makefile
> ==============================================================================
> --- head/lib/libarchive/Makefile Sun May 16 20:31:31 2010 (r208168)
> +++ head/lib/libarchive/Makefile Sun May 16 20:43:17 2010 (r208169)
> @@ -2,8 +2,16 @@
> .include <bsd.own.mk>
>
> LIB= archive
> -DPADD= ${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBLZMA}
> -LDADD= -lbz2 -lz -lmd -llzma
> +DPADD= ${LIBZ} ${LIBMD}
> +LDADD= -lz -lmd
> +
> +DPADD+= ${LIBBZ2}
> +LDADD+= -lbz2
> +CFLAGS+= -DHAVE_BZLIB_H 1
We need an equal-sign in -DHAVE_BZLIB_H=1 here. Otherwise libarchive is
broken with:
% cc -O2 -pipe -DHAVE_BZLIB_H 1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 \
% -DPLATFORM_CONFIG_H=\"config_freebsd.h\" \
% -I/usr/obj/usr/src/lib/libarchive -DWITH_OPENSSL -g -std=gnu99 \
% -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k \
% -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes \
% -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch \
% -Wshadow -Wunused-parameter -Wcast-align -Wchar-subscripts \
% -Winline -Wnested-externs -Wredundant-decls -Wold-style-definition \
% -Wno-pointer-sign -c /usr/src/lib/libarchive/archive_check_magic.c
% cc: 1: No such file or directory
More information about the svn-src-head
mailing list