[CRIU] [PATCH] make: fix build of protobuf/ directory

Filipe Brandenburger filbranden at google.com
Tue Jan 20 21:45:41 PST 2015


Commit 97743f421c6557 ("make: fix multithreded compilation") broke the
build by introducing opts.pb-c.c as a dependency of any *.pb-c.c in the
protobuf/ directory. Fix that by reverting that part of the patch.

Reported-by: Saied Kazemi <saied at google.com>
Signed-off-by: Filipe Brandenburger <filbranden at google.com>
---
 protobuf/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/protobuf/Makefile b/protobuf/Makefile
index 9c7a0bbdb983..0c3196b3c0e5 100644
--- a/protobuf/Makefile
+++ b/protobuf/Makefile
@@ -89,7 +89,7 @@ $(obj)/%.proto.c.d: $(obj)/%.proto | $(obj)/%.proto.d
 		-e 's/.*/$(subst .proto,.pb-c.c,$(subst /,\/,$<)):$(subst /,\/,$(obj))\/&/'	| \
 		uniq > $@
 
-$(obj)/%.pb-c.c $(obj)/%.pb-c.h: $(obj)/%.proto $(obj)/%.proto.c.d $(obj)/opts.pb-c.c
+$(obj)/%.pb-c.c $(obj)/%.pb-c.h: $(obj)/%.proto $(obj)/%.proto.c.d
 	$(E) "  PBCC    " $@
 	$(Q) protoc-c --proto_path=$(obj)/ --c_out=$(obj)/ $<
 ifeq ($(SRCARCH),arm)
-- 
2.2.0.rc0.207.ga3a616c



More information about the CRIU mailing list