svn commit: r283151 - head

[Andriy Gapon]

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