[CRIU] [PATCH] build: Don't forget to rebuild pie code on compel plugins change

Andrey Vagin avagin at virtuozzo.com
Tue Oct 24 01:44:19 MSK 2017


Applied, thanks!!
On Sat, Oct 21, 2017 at 11:25:03PM +0300, Cyrill Gorcunov wrote:
> https://github.com/checkpoint-restore/criu/issues/399
> 
> Rerorted-by: Andrew Vagin <avagin at openvz.org>
> Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
> ---
>  Makefile.compel   | 1 +
>  criu/pie/Makefile | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/Makefile.compel b/Makefile.compel
> index 1ef7f8cb2091..8768c795d933 100644
> --- a/Makefile.compel
> +++ b/Makefile.compel
> @@ -28,6 +28,7 @@ LIBCOMPEL_SO		:= libcompel.so
>  LIBCOMPEL_A		:= libcompel.a
>  export LIBCOMPEL_SO LIBCOMPEL_A
>  criu-deps		+= compel/$(LIBCOMPEL_A)
> +criu-deps		+= $(compel-plugins)
>  
>  #
>  # Compel itself.
> diff --git a/criu/pie/Makefile b/criu/pie/Makefile
> index de4d667a5035..8b05c14a0e43 100644
> --- a/criu/pie/Makefile
> +++ b/criu/pie/Makefile
> @@ -37,7 +37,7 @@ $(1)-obj-e	+= pie.lib.a
>  $(1)-obj-e	+= $$(compel_plugins)
>  
>  # Dependency on compel linker script, to relink if it has changed
> -$$(obj)/$(1).built-in.o: $$(LDS)
> +$$(obj)/$(1).built-in.o: $$(LDS) $$(compel_plugins)
>  
>  $$(obj)/$(1)-blob.h: $$(obj)/$(1).built-in.o
>  	$$(call msg-gen, $$@)
> -- 
> 2.7.5
> 


More information about the CRIU mailing list