Skip to content

Commit 6e1e744

Browse files
committed
Change google protobuf from v2.5.0 to v3.5.1
(Note: v2.5.0 has the bug on serialization and de-serialization message. )
1 parent 8a76389 commit 6e1e744

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

make/deps.mk

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
# Install dependencies
22

3-
URL=https://raw.githubusercontent.com/mli/deps/master/build
3+
URL1=https://raw.githubusercontent.com/mli/deps/master/build
4+
URL2=https://github.com/google/protobuf/releases/download/v3.5.1
45
ifndef WGET
56
WGET = wget
67
endif
78

89
# protobuf
910
PROTOBUF = ${DEPS_PATH}/include/google/protobuf/message.h
1011
${PROTOBUF}:
11-
$(eval FILE=protobuf-2.5.0.tar.gz)
12-
$(eval DIR=protobuf-2.5.0)
12+
$(eval FILE=protobuf-cpp-3.5.1.tar.gz)
13+
$(eval DIR=protobuf-3.5.1)
1314
rm -rf $(FILE) $(DIR)
14-
$(WGET) $(URL)/$(FILE) && tar --no-same-owner -zxf $(FILE)
15+
$(WGET) $(URL2)/$(FILE) && tar --no-same-owner -zxf $(FILE)
1516
cd $(DIR) && export CFLAGS=-fPIC && export CXXFLAGS=-fPIC && ./configure -prefix=$(DEPS_PATH) && $(MAKE) && $(MAKE) install
1617
rm -rf $(FILE) $(DIR)
1718

@@ -22,7 +23,7 @@ ${ZMQ}:
2223
$(eval FILE=zeromq-4.1.4.tar.gz)
2324
$(eval DIR=zeromq-4.1.4)
2425
rm -rf $(FILE) $(DIR)
25-
$(WGET) $(URL)/$(FILE) && tar --no-same-owner -zxf $(FILE)
26+
$(WGET) $(URL1)/$(FILE) && tar --no-same-owner -zxf $(FILE)
2627
cd $(DIR) && export CFLAGS=-fPIC && export CXXFLAGS=-fPIC && ./configure -prefix=$(DEPS_PATH) --with-libsodium=no --with-libgssapi_krb5=no && $(MAKE) && $(MAKE) install
2728
rm -rf $(FILE) $(DIR)
2829

@@ -32,7 +33,7 @@ ${LZ4}:
3233
$(eval FILE=lz4-r129.tar.gz)
3334
$(eval DIR=lz4-r129)
3435
rm -rf $(FILE) $(DIR)
35-
wget $(URL)/$(FILE) && tar --no-same-owner -zxf $(FILE)
36+
wget $(URL1)/$(FILE) && tar --no-same-owner -zxf $(FILE)
3637
cd $(DIR) && $(MAKE) && PREFIX=$(DEPS_PATH) $(MAKE) install
3738
rm -rf $(FILE) $(DIR)
3839

@@ -42,7 +43,7 @@ ${CITYHASH}:
4243
$(eval FILE=cityhash-1.1.1.tar.gz)
4344
$(eval DIR=cityhash-1.1.1)
4445
rm -rf $(FILE) $(DIR)
45-
wget $(URL)/$(FILE) && tar --no-same-owner -zxf $(FILE)
46+
wget $(URL1)/$(FILE) && tar --no-same-owner -zxf $(FILE)
4647
cd $(DIR) && ./configure -prefix=$(DEPS_PATH) --enable-sse4.2 && $(MAKE) CXXFLAGS="-g -O3 -msse4.2" && $(MAKE) install
4748
rm -rf $(FILE) $(DIR)
4849

src/meta.proto

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/**
22
* Copyright (c) 2015 by Contributors
33
*/
4+
syntax = "proto2";
45
package ps;
56
option optimize_for = LITE_RUNTIME;
67

0 commit comments

Comments
 (0)