Bump protobuf version check from 3.0.0 to 3.5.0

pull/14821/head
Srini Polavarapu 7 years ago
parent bbb7259fe8
commit cdc0e28fe5
  1. 354
      Makefile
  2. 10
      templates/Makefile.template

File diff suppressed because it is too large Load Diff

@ -416,7 +416,7 @@
OPENSSL_ALPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.2 openssl OPENSSL_ALPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.2 openssl
OPENSSL_NPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.1 openssl OPENSSL_NPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.1 openssl
ZLIB_CHECK_CMD = $(PKG_CONFIG) --exists zlib ZLIB_CHECK_CMD = $(PKG_CONFIG) --exists zlib
PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.0.0 protobuf PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.5.0 protobuf
CARES_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.11.0 libcares CARES_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.11.0 libcares
else # HAS_PKG_CONFIG else # HAS_PKG_CONFIG
@ -844,7 +844,7 @@
@echo @echo
@echo "DEPENDENCY ERROR" @echo "DEPENDENCY ERROR"
@echo @echo
@echo "The target you are trying to run requires protobuf 3.0.0+" @echo "The target you are trying to run requires protobuf 3.5.0+"
@echo "Your system doesn't have it, and neither does the third_party directory." @echo "Your system doesn't have it, and neither does the third_party directory."
@echo @echo
@echo "Please consult INSTALL to get more information." @echo "Please consult INSTALL to get more information."
@ -858,7 +858,7 @@
@echo @echo
@echo "DEPENDENCY ERROR" @echo "DEPENDENCY ERROR"
@echo @echo
@echo "The target you are trying to run requires protobuf-compiler 3.0.0+" @echo "The target you are trying to run requires protobuf-compiler 3.5.0+"
@echo "Your system doesn't have it, and neither does the third_party directory." @echo "Your system doesn't have it, and neither does the third_party directory."
@echo @echo
@echo "Please consult INSTALL to get more information." @echo "Please consult INSTALL to get more information."
@ -1636,7 +1636,7 @@
% endif % endif
% if lib.language == 'c++': % if lib.language == 'c++':
## If the lib was C++, we have to close the Makefile's if that tested ## If the lib was C++, we have to close the Makefile's if that tested
## the presence of protobuf 3.0.0+ ## the presence of protobuf 3.5.0+
endif endif
% endif % endif
@ -1702,7 +1702,7 @@
ifeq ($(NO_PROTOBUF),true) ifeq ($(NO_PROTOBUF),true)
# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+. # You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.5.0+.
$(BINDIR)/$(CONFIG)/${tgt.name}: protobuf_dep_error $(BINDIR)/$(CONFIG)/${tgt.name}: protobuf_dep_error

Loading…
Cancel
Save