diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-02 21:45:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-02 21:45:28 +0100 |
| commit | 2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch) | |
| tree | c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /net-libs/grpc/files | |
| parent | 6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff) | |
gentoo resync : 02.06.2019
Diffstat (limited to 'net-libs/grpc/files')
| -rw-r--r-- | net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch b/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch new file mode 100644 index 000000000000..213a39a38438 --- /dev/null +++ b/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch @@ -0,0 +1,47 @@ +From 913486fddb5c2600f6ff83e549ee25e67579666f Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Wed, 22 May 2019 23:04:28 -0700 +Subject: [PATCH] Makefile: fix host ar handling + +picked lines from +https://github.com/grpc/grpc/pull/11476 +--- + Makefile | 236 ++++++++++++++++++++++++++++--------------------------- + 1 file changed, 119 insertions(+), 117 deletions(-) + +diff --git a/Makefile b/Makefile +index 67495f2..e1c741c 100644 +--- a/Makefile ++++ b/Makefile +@@ -346,6 +346,7 @@ HOST_CC ?= $(CC) + HOST_CXX ?= $(CXX) + HOST_LD ?= $(LD) + HOST_LDXX ?= $(LDXX) ++HOST_AR ?= $(AR) + + CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI) + CXXFLAGS += -std=c++11 +@@ -483,6 +484,7 @@ HOST_CFLAGS += $(CFLAGS) + HOST_CXXFLAGS += $(CXXFLAGS) + HOST_LDFLAGS += $(LDFLAGS) + HOST_LDLIBS += $(LDLIBS) ++HOST_AROPTS = $(AROPTS) + + # These are automatically computed variables. + # There shouldn't be any need to change anything from now on. + +@@ -7381,11 +7383,11 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error + + else + +-$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS) +- $(E) "[AR] Creating $@" ++$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS) ++ $(E) "[HOSTAR] Creating $@" + $(Q) mkdir -p `dirname $@` + $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a +- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS) ++ $(Q) $(HOST_AR) $(HOST_AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS) + ifeq ($(SYSTEM),Darwin) + $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a + endif |