diff options
| author |  kkm <kkm@smartaction.com> | 2018-10-14 08:38:19 -0700 |
|---|---|---|
| committer | kkm <kkm@smartaction.com> | 2018-10-14 08:38:19 -0700 |
| commit | 4cf8cfd93d1fce082ce4576f5a46081c99ab98c3 (patch) | |
| tree | b70e6be577dae4d4e7c3b6240832c165e60e4288 /templates | |
| parent | 5103951117fa4c7350427ecd340031316a15615e (diff) | |
| parent | d0cb61eada9d270b9043ec866b55c88617d362be (diff) | |
Merge remote-tracking branch 'golden/master' into package-grpc-tools
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 4 | ||||
| -rw-r--r-- | templates/tools/dockerfile/gcp_api_libraries.include | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 2e3d75d819..0b67416d3e 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -692,7 +692,7 @@ PC_CFLAGS = PC_REQUIRES_PRIVATE = gpr $(PC_REQUIRES_GRPC) PC_LIBS_PRIVATE = $(PC_LIBS_GRPC) - PC_LIB = -lgrpc + PC_LIB = -lgrpc_unsecure GRPC_UNSECURE_PC_FILE := $(CORE_PC_TEMPLATE) PROTOBUF_PKG_CONFIG = false @@ -769,7 +769,7 @@ PC_CFLAGS = PC_REQUIRES_PRIVATE = grpc_unsecure $(PC_REQUIRES_GRPCXX) PC_LIBS_PRIVATE = $(PC_LIBS_GRPCXX) - PC_LIB = -lgrpc++ + PC_LIB = -lgrpc++_unsecure GRPCXX_UNSECURE_PC_FILE := $(CPP_PC_TEMPLATE) ifeq ($(MAKECMDGOALS),clean) diff --git a/templates/tools/dockerfile/gcp_api_libraries.include b/templates/tools/dockerfile/gcp_api_libraries.include index adecb92c15..5a263649d2 100644 --- a/templates/tools/dockerfile/gcp_api_libraries.include +++ b/templates/tools/dockerfile/gcp_api_libraries.include @@ -1,3 +1,3 @@ # Google Cloud platform API libraries RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client +RUN pip install --upgrade google-api-python-client oauth2client |