[CRIU] [PATCH 04/11] make: Itroduce PROTOUFIX variable
Cyrill Gorcunov
gorcunov at openvz.org
Wed Apr 22 10:19:59 PDT 2015
We will need it for x86-32 as well, not on ARM only.
Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
Makefile | 7 +++++++
protobuf/Makefile | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 6e6efb290823..ed2a1992efd5 100644
--- a/Makefile
+++ b/Makefile
@@ -51,6 +51,8 @@ ifeq ($(ARCH),i386)
SRCARCH := x86-32
DEFINES := -DCONFIG_X86_32
VDSO := y
+ PROTOUFIX := y
+ export PROTOUFIX
endif
ifeq ($(ARCH),x86_64)
SRCARCH := x86
@@ -78,6 +80,11 @@ ifeq ($(ARCH),aarch64)
VDSO := y
endif
+ifeq ($(SRCARCH),arm)
+ PROTOUFIX := y
+ export PROTOUFIX
+endif
+
SRCARCH ?= $(ARCH)
LDARCH ?= $(SRCARCH)
diff --git a/protobuf/Makefile b/protobuf/Makefile
index 3cb44862e043..fdfe65bf06be 100644
--- a/protobuf/Makefile
+++ b/protobuf/Makefile
@@ -74,7 +74,7 @@ define gen-proto-rules
$(obj)/$(1).pb-c.c $(obj)/$(1).pb-c.h: $(obj)/$(1).proto $(addsuffix .pb-c.c,$(addprefix $(obj)/,$(2)))
$$(E) " PBCC " $$@
$$(Q) protoc-c --proto_path=$(obj)/ --c_out=$(obj)/ $$<
-ifeq ($(SRCARCH),arm)
+ifeq ($(PROTOUFIX),y)
$$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$@
$$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$(patsubst %.c,%.h,$$@)
$$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$(patsubst %.h,%.c,$$@)
--
2.1.0
More information about the CRIU
mailing list