From owner-svn-src-all@FreeBSD.ORG Wed May 20 17:25:59 2015 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3D015AE; Wed, 20 May 2015 17:25:59 +0000 (UTC) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id DF8AB183D; Wed, 20 May 2015 17:25:57 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id UAA18233; Wed, 20 May 2015 20:25:55 +0300 (EEST) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1Yv7kh-000E0g-FR; Wed, 20 May 2015 20:25:55 +0300 Message-ID: <555CC352.60302@FreeBSD.org> Date: Wed, 20 May 2015 20:24:34 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Garrett Cooper , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Subject: Re: svn commit: r283151 - head References: <201505201304.t4KD41Bn063189@svn.freebsd.org> <555CBDE2.6080401@FreeBSD.org> In-Reply-To: <555CBDE2.6080401@FreeBSD.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 20 May 2015 17:25:59 -0000 On 20/05/2015 20:01, Andriy Gapon wrote: > On 20/05/2015 16:04, Garrett Cooper wrote: >> Author: ngie >> Date: Wed May 20 13:04:00 2015 >> New Revision: 283151 >> URL: https://svnweb.freebsd.org/changeset/base/283151 >> >> Log: >> cddl/lib/libctf isn't always a requirement for lib/libproc; its use is dependent >> on MK_CTF != "no". Use the other divined value instead of reinventing the wheel >> >> Modified: >> head/Makefile.inc1 >> >> Modified: head/Makefile.inc1 >> ============================================================================== >> --- head/Makefile.inc1 Wed May 20 12:56:40 2015 (r283150) >> +++ head/Makefile.inc1 Wed May 20 13:04:00 2015 (r283151) >> @@ -1747,7 +1747,7 @@ _generic_libs+= ${_DIR} >> lib/libopie__L lib/libtacplus__L: lib/libmd__L >> >> lib/libproc__L: \ >> - cddl/lib/libctf__L lib/libelf__L lib/librtld_db__L lib/libutil__L >> + ${_cddl_lib_libctf} lib/libelf__L lib/librtld_db__L lib/libutil__L Should the above perhaps be ${_cddl_lib_libctf}__L? But such that it is empty if _cddl_lib_libctf is unset. Not sure how to express that with the make syntax. In shell it'd be ${_cddl_lib_libctf:+${_cddl_lib_libctf}__L}. >> .if ${MK_CXX} != "no" >> .if ${MK_LIBCPLUSPLUS} != "no" >> lib/libproc__L: lib/libc++ >> > > I've just experienced a buildworld failure in lib/libproc. The build complained > about missing -lctf. At this moment I am not sure if that was a parallel build > issue or something caused by this commit. > -- Andriy Gapon