[CRIU] [PATCH] build: generate config.h in the top-make

Dmitry Safonov dsafonov at virtuozzo.com
Mon Sep 26 07:06:53 PDT 2016


On 09/26/2016 05:04 PM, Cyrill Gorcunov wrote:
> On Mon, Sep 26, 2016 at 04:05:43PM +0300, Dmitry Safonov wrote:
>> So, we need CONFIG_HAS_* feature-defines in compel, libsoccr
>> tools. Let's move this tests upper.
>>
>> It also reverts commit 411cde8815a4 ("make, soccr: let CRIU depend on
>> libsoccr"), as we don't need -lsoccr to build feature tests now.
>> To eliminate any races here, I added $(LIB_FEATURES).
>>
>> Cc: Cyrill Gorcunov <gorcunov at openvz.org>
>> Signed-off-by: Dmitry Safonov <dsafonov at virtuozzo.com>
>>  # But note that we're already included
>>  # the nmk so we can reuse it there.
>> -criu/%: images/built-in.o compel/compel-host $(SOCCR_A) $(VERSION_HEADER) .FORCE
>> +criu/%: images/built-in.o compel/compel-host $(VERSION_HEADER) .FORCE
>>  	$(Q) $(MAKE) $(build)=criu $@
>
> Why we drop $(SOCCR_A) here?

It's needed only for linking (for criu/criu).
While I introduced it in 411cde8815a4, it was only for fast fixup:
criu had feature tests that were built with $(LIBS).
And $(LIBS) contained libsoccr, so it was side-dependency for
feature-tests _only_.
Otherwise, feature-tests failed as libsoccr may not be built at time of
criu object building.

As I've moved feature-tests outside of CRIU, that side-dependency became
unneeded.

-- 
              Dmitry


More information about the CRIU mailing list