From 0d1332f5918ec85e0e7785baba424022577c1585 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 2 Oct 2018 13:03:51 +0200 Subject: fix *_unsecure.pc files --- templates/Makefile.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') 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) -- cgit v1.2.3 From 352b6945445df3f24a67929f90923e9f4008bdbe Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 8 Oct 2018 15:53:48 +0200 Subject: fix google-api-python-client installation --- templates/tools/dockerfile/gcp_api_libraries.include | 2 +- tools/dockerfile/test/csharp_jessie_x64/Dockerfile | 2 +- tools/dockerfile/test/cxx_jessie_x64/Dockerfile | 2 +- tools/dockerfile/test/cxx_jessie_x86/Dockerfile | 2 +- tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile | 2 +- tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile | 2 +- tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile | 2 +- tools/dockerfile/test/cxx_ubuntu1710_x64/Dockerfile | 2 +- tools/dockerfile/test/fuzzer/Dockerfile | 2 +- tools/dockerfile/test/multilang_jessie_x64/Dockerfile | 2 +- tools/dockerfile/test/node_jessie_x64/Dockerfile | 2 +- tools/dockerfile/test/php7_jessie_x64/Dockerfile | 2 +- tools/dockerfile/test/php_jessie_x64/Dockerfile | 2 +- tools/dockerfile/test/python_jessie_x64/Dockerfile | 2 +- tools/dockerfile/test/python_pyenv_x64/Dockerfile | 2 +- tools/dockerfile/test/ruby_jessie_x64/Dockerfile | 2 +- tools/dockerfile/test/sanity/Dockerfile | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) (limited to 'templates') 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 diff --git a/tools/dockerfile/test/csharp_jessie_x64/Dockerfile b/tools/dockerfile/test/csharp_jessie_x64/Dockerfile index 578bf427cd..030d301a40 100644 --- a/tools/dockerfile/test/csharp_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/csharp_jessie_x64/Dockerfile @@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean # 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 #==================== # Python dependencies diff --git a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile index c4f959fc1d..f9dc8f20d7 100644 --- a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile @@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean # 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 #==================== # Python dependencies diff --git a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile index d07ea9a9b0..76015c8c42 100644 --- a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile @@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean # 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 #==================== # Python dependencies diff --git a/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile index f60f67665d..77aac3cdec 100644 --- a/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile @@ -52,7 +52,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean # 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 #==================== # Python dependencies diff --git a/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile b/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile index b0d9261af2..09479ba2f7 100644 --- a/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile @@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean # 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 #==================== # Python dependencies diff --git a/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile b/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile index 439baadc2c..3a87639794 100644 --- a/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile @@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean # 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 #==================== # Python dependencies diff --git a/tools/dockerfile/test/cxx_ubuntu1710_x64/Dockerfile b/tools/dockerfile/test/cxx_ubuntu1710_x64/Dockerfile index b80249d2d8..d4117f83c8 100644 --- a/tools/dockerfile/test/cxx_ubuntu1710_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_ubuntu1710_x64/Dockerfile @@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean # 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 #==================== # Python dependencies diff --git a/tools/dockerfile/test/fuzzer/Dockerfile b/tools/dockerfile/test/fuzzer/Dockerfile index 986cfcbada..7f871f2f62 100644 --- a/tools/dockerfile/test/fuzzer/Dockerfile +++ b/tools/dockerfile/test/fuzzer/Dockerfile @@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean # 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 #==================== # Python dependencies diff --git a/tools/dockerfile/test/multilang_jessie_x64/Dockerfile b/tools/dockerfile/test/multilang_jessie_x64/Dockerfile index ad719f330f..3c95554b02 100644 --- a/tools/dockerfile/test/multilang_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/multilang_jessie_x64/Dockerfile @@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean # 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 #================ # C# dependencies diff --git a/tools/dockerfile/test/node_jessie_x64/Dockerfile b/tools/dockerfile/test/node_jessie_x64/Dockerfile index 1fe44b6dd7..7c36fb3734 100644 --- a/tools/dockerfile/test/node_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/node_jessie_x64/Dockerfile @@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean # 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 # Install Electron apt dependencies diff --git a/tools/dockerfile/test/php7_jessie_x64/Dockerfile b/tools/dockerfile/test/php7_jessie_x64/Dockerfile index 53ef7b3443..0dff839904 100644 --- a/tools/dockerfile/test/php7_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/php7_jessie_x64/Dockerfile @@ -62,7 +62,7 @@ RUN cd /var/local/git/php-src \ # 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 #==================== # Python dependencies diff --git a/tools/dockerfile/test/php_jessie_x64/Dockerfile b/tools/dockerfile/test/php_jessie_x64/Dockerfile index e884572640..ed59e56995 100644 --- a/tools/dockerfile/test/php_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/php_jessie_x64/Dockerfile @@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean # 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 #==================== # Python dependencies diff --git a/tools/dockerfile/test/python_jessie_x64/Dockerfile b/tools/dockerfile/test/python_jessie_x64/Dockerfile index c2b4c1845b..a4c3a9f91e 100644 --- a/tools/dockerfile/test/python_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/python_jessie_x64/Dockerfile @@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean # 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 #==================== # Python dependencies diff --git a/tools/dockerfile/test/python_pyenv_x64/Dockerfile b/tools/dockerfile/test/python_pyenv_x64/Dockerfile index c23e67c904..d94ccc8c74 100644 --- a/tools/dockerfile/test/python_pyenv_x64/Dockerfile +++ b/tools/dockerfile/test/python_pyenv_x64/Dockerfile @@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean # 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 #==================== # Python dependencies diff --git a/tools/dockerfile/test/ruby_jessie_x64/Dockerfile b/tools/dockerfile/test/ruby_jessie_x64/Dockerfile index d6f7459685..321b501de2 100644 --- a/tools/dockerfile/test/ruby_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/ruby_jessie_x64/Dockerfile @@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean # 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 #==================== # Python dependencies diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile index cb153012ea..e6bdb4ee03 100644 --- a/tools/dockerfile/test/sanity/Dockerfile +++ b/tools/dockerfile/test/sanity/Dockerfile @@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean # 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 #==================== # Python dependencies -- cgit v1.2.3