From owner-freebsd-stable@FreeBSD.ORG Wed May 26 05:06:17 2010 Return-Path: Delivered-To: stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB0B6106566C for ; Wed, 26 May 2010 05:06:17 +0000 (UTC) (envelope-from kientzle@freebsd.org) Received: from monday.kientzle.com (kientzle.com [66.166.149.50]) by mx1.freebsd.org (Postfix) with ESMTP id 6F4D78FC28 for ; Wed, 26 May 2010 05:06:17 +0000 (UTC) Received: (from root@localhost) by monday.kientzle.com (8.14.3/8.14.3) id o4Q4dhJv008958; Wed, 26 May 2010 04:39:43 GMT (envelope-from kientzle@freebsd.org) Received: from horton.x.kientzle.com (fw2.kientzle.com [10.123.1.2]) by kientzle.com with SMTP id hxt766zrc3ih9uzvxa6sqrpxk6; Wed, 26 May 2010 04:39:42 +0000 (UTC) (envelope-from kientzle@freebsd.org) Message-ID: <4BFCA5FB.80109@freebsd.org> Date: Tue, 25 May 2010 21:39:23 -0700 From: Tim Kientzle User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.8.1.23) Gecko/20100314 SeaMonkey/1.1.18 MIME-Version: 1.0 To: Garrett Cooper References: <8A12D1D8-7D3D-472A-8B2B-637D3E243D56@gmail.com> In-Reply-To: <8A12D1D8-7D3D-472A-8B2B-637D3E243D56@gmail.com> Content-Type: multipart/mixed; boundary="------------020706090309050304080307" Cc: stable@freebsd.org, Martin Matuska Subject: Re: lzma support in `stable' has potential issues X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 May 2010 05:06:17 -0000 This is a multi-part message in MIME format. --------------020706090309050304080307 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit It would be nice if "cd /usr/src/lib/liblzma && make && make install" just worked on an existing system that didn't already have /usr/include/lzma, but I can't find anything in the standard BSD makefiles to support this. I think you can use: make hierarchy to ensure that all the directories are present before trying to build anything else. (This is one of the first steps in the "installworld" target.) As for lzmainfo, I think the attached patch fixes it so that it pulls the lzma headers from the source tree and not the installed system. A similar change is probably appropriate for the other lzma and xz tools. Tim Garrett Cooper wrote: > Hi Martin and Tim, > I recently wiped off my Lenovo again to get a fresh install of FreeBSD on it, and started out at 8.0-RELEASE (it's the media that I had on hand at the time). Upgrading to 8-STABLE appears to be problematic though. > On a few different occasions I ran into issues doing the following: > > make -C /usr/src/usr.bin/lzmainfo depend - fails to find the appropriate headers > > make -C /usr/src/lib/liblzma install - fails to install the headers into /usr/include/lzma > > Etc. I didn't see these issues before lzma was imported into the tree, which makes me wonder whether or not there are some missing build or install dependencies somewhere. > Thanks, > -Garrett > --------------020706090309050304080307 Content-Type: text/x-patch; name="lzmainfo.Makefile.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="lzmainfo.Makefile.patch" Index: Makefile =================================================================== --- Makefile (revision 208369) +++ Makefile (working copy) @@ -3,7 +3,6 @@ PROG= lzmainfo XZDIR= ${.CURDIR}/../../contrib/xz/src -LZMALIBDIR= ${.CURDIR}/../../lib/liblzma .PATH: ${XZDIR}/lzmainfo SRCS+= lzmainfo.c @@ -14,9 +13,10 @@ WARNS?= 3 -CFLAGS+= -DHAVE_CONFIG_H \ - -I${LZMALIBDIR} \ - -I${XZDIR}/common +CFLAGS+= -DHAVE_CONFIG_H +CFLAGS+= -I${.CURDIR}/../../lib/liblzma +CFLAGS+= -I${.CURDIR}/../../contrib/xz/src/liblzma/api +CFLAGS+= -I${XZDIR}/common DPADD= ${LIBLZMA} LDADD= -llzma --------------020706090309050304080307--