From: Steinar H. Gunderson <sesse@debian.org>
Date: Tue, 22 Sep 2020 17:29:12 +0000 (+0100)
Subject: Fix compilation of tests with non-vendored (ie., Debian's) zlib.
X-Git-Tag: archive/raspbian/1.30.2-2.1+rpi1~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3b0185721ae08fa6897851faae9d33865b05d6d3;p=grpc.git

Fix compilation of tests with non-vendored (ie., Debian's) zlib.


Gbp-Pq: Name unvendor-zlib.diff
---

diff --git a/Makefile b/Makefile
index b801b219..c0a27079 100644
--- a/Makefile
+++ b/Makefile
@@ -1365,7 +1365,7 @@ plugins: $(PROTOC_PLUGINS)
 
 privatelibs: privatelibs_c privatelibs_cxx
 
-privatelibs_c:  $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libz.a $(LIBDIR)/$(CONFIG)/libares.a
+privatelibs_c:  $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libares.a
 pc_c: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc.pc $(LIBDIR)/$(CONFIG)/pkgconfig/gpr.pc
 
 pc_c_unsecure: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc_unsecure.pc $(LIBDIR)/$(CONFIG)/pkgconfig/gpr.pc