From owner-svn-src-head@freebsd.org Thu Mar 17 04:09:14 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AB67CAD3FB8; Thu, 17 Mar 2016 04:09:14 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 9C8A9D3C; Thu, 17 Mar 2016 04:09:14 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id 95A2612FE; Thu, 17 Mar 2016 04:09:14 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 4F1721F915; Thu, 17 Mar 2016 04:09:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id gb0FYueQPDH8; Thu, 17 Mar 2016 04:09:12 +0000 (UTC) Subject: Re: svn commit: r296967 - in head: contrib/libxo/libxo lib/libxo DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com AB56E1F90F To: Phil Shafer , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201603162350.u2GNofuL068498@repo.freebsd.org> From: Bryan Drewery Organization: FreeBSD Message-ID: <56EA2DD7.10204@FreeBSD.org> Date: Wed, 16 Mar 2016 21:08:55 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:38.0) Gecko/20100101 Thunderbird/38.7.0 MIME-Version: 1.0 In-Reply-To: <201603162350.u2GNofuL068498@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Mar 2016 04:09:14 -0000 On 3/16/16 4:50 PM, Phil Shafer wrote: > Author: phil > Date: Wed Mar 16 23:50:41 2016 > New Revision: 296967 > URL: https://svnweb.freebsd.org/changeset/base/296967 > > Log: > Move generated file from contrib to build directory. > > Reviewed by: obrien > Approved by: sjg > > Added: > head/lib/libxo/xo_config.h > - copied unchanged from r296966, head/contrib/libxo/libxo/xo_config.h > Deleted: > head/contrib/libxo/libxo/xo_config.h > Modified: > head/lib/libxo/Makefile > > Modified: head/lib/libxo/Makefile > ============================================================================== > --- head/lib/libxo/Makefile Wed Mar 16 23:42:57 2016 (r296966) > +++ head/lib/libxo/Makefile Wed Mar 16 23:50:41 2016 (r296967) > @@ -13,7 +13,7 @@ SHLIB_MAJOR=0 > > SRCS= libxo.c xo_encoder.c xo_syslog.c > > -CFLAGS+=-I${LIBXOSRC}/libxo > +CFLAGS+=-I${LIBXOSRC}/libxo -I${.CURDIR} > CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\" > > INCS= xo.h xo_encoder.h This breaks the build for usr.bin/xo and lib/libxo/tests. https://lists.freebsd.org/pipermail/freebsd-current/2016-March/060181.html -- Regards, Bryan Drewery