From owner-svn-src-all@FreeBSD.ORG Mon May 17 01:20:50 2010 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 35CBF106566B; Mon, 17 May 2010 01:20:50 +0000 (UTC) (envelope-from keramida@ceid.upatras.gr) Received: from igloo.linux.gr (igloo.linux.gr [62.1.205.36]) by mx1.freebsd.org (Postfix) with ESMTP id 9E5DC8FC14; Mon, 17 May 2010 01:20:49 +0000 (UTC) X-Spam-Status: No X-Hellug-MailScanner-From: keramida@ceid.upatras.gr X-Hellug-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-1.001, required 5, autolearn=not spam, ALL_TRUSTED -1.00, BAYES_40 -0.00) X-Hellug-MailScanner: Found to be clean X-Hellug-MailScanner-ID: o4H12i8J022125 Received: from kobe.laptop (ppp-94-64-236-75.home.otenet.gr [94.64.236.75]) (authenticated bits=128) by igloo.linux.gr (8.14.3/8.14.3/Debian-9.1) with ESMTP id o4H12i8J022125 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 17 May 2010 04:02:50 +0300 Received: from kobe.laptop (kobe.laptop [127.0.0.1]) by kobe.laptop (8.14.4/8.14.4) with ESMTP id o4H12hsC057801 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 17 May 2010 04:02:44 +0300 (EEST) (envelope-from keramida@ceid.upatras.gr) Received: (from keramida@localhost) by kobe.laptop (8.14.4/8.14.4/Submit) id o4H12h9h057798; Mon, 17 May 2010 04:02:43 +0300 (EEST) (envelope-from keramida@ceid.upatras.gr) From: Giorgos Keramidas To: Tim Kientzle References: <201005162043.o4GKhHp8010715@svn.freebsd.org> Date: Mon, 17 May 2010 04:02:43 +0300 In-Reply-To: <201005162043.o4GKhHp8010715@svn.freebsd.org> (Tim Kientzle's message of "Sun, 16 May 2010 20:43:17 +0000 (UTC)") Message-ID: <87fx1r8hn0.fsf@kobe.laptop> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r208169 - head/lib/libarchive X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 01:20:50 -0000 On Sun, 16 May 2010 20:43:17 +0000 (UTC), Tim Kientzle 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 > > 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