[CRIU] [PATCH 2/2] make: protobuf -- Fix building, v3

Cyrill Gorcunov gorcunov at gmail.com
Tue Jan 20 14:24:35 PST 2015


On Tue, Jan 20, 2015 at 11:24:33PM +0300, Cyrill Gorcunov wrote:
> On Tue, Jan 20, 2015 at 11:23:08PM +0300, Cyrill Gorcunov wrote:
> > On Tue, Jan 20, 2015 at 11:18:14PM +0300, Cyrill Gorcunov wrote:
> > >  - fix typo in proto-obj-y
> > >  - drop unneeded opts.pb-c.c dep due to prev typo
> > 
> > attached
> 
> Drop it as well please, something still unresolved...

Pick up this one please, just a typo. There some weird effects
in secondary targets, need to figure out. Still both patches
are fine to apply.

	Cyrill
-------------- next part --------------
>From fe7a0fbaad13cf0a342ebe559e5feedbec4a0271 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov at openvz.org>
Date: Wed, 21 Jan 2015 01:22:59 +0300
Subject: [PATCH 2/2] make: protobuf -- Fix typo

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 protobuf/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/protobuf/Makefile b/protobuf/Makefile
index 7c7df68325de..35c81bc35f29 100644
--- a/protobuf/Makefile
+++ b/protobuf/Makefile
@@ -64,7 +64,7 @@ proto-obj-y	+= ext-file.o
 proto-obj-y	+= cgroup.o
 proto-obj-y	+= userns.o
 proto-obj-y	+= google/protobuf/descriptor.o # To make protoc-c happy and compile opts.proto
-proto-pbj-y	+= opts.o
+proto-obj-y	+= opts.o
 
 proto		:= $(proto-obj-y:.o=)
 proto-c		:= $(proto-obj-y:.o=.pb-c.c)
-- 
1.9.3



More information about the CRIU mailing list