From 904bf59fb19a2c1863d86f5f13c69823c538ac83 Mon Sep 17 00:00:00 2001 From: Georgy Yakovlev Date: Sat, 27 Jul 2019 02:06:41 -0700 Subject: net-libs/grpc: rename all patches Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Georgy Yakovlev --- .../0001-grpc-1.13.0-fix-host-ar-handling.patch | 47 ------------------- .../files/0003-grpc-1.3.0-Don-t-run-ldconfig.patch | 53 ---------------------- .../files/0005-grpc-1.11.0-pkgconfig-libdir.patch | 17 ------- .../grpc/files/1.21.0-fix-host-ar-handling.patch | 47 ------------------- .../1.22.0-cxx_arg_list_too_long_forloop.patch | 44 ------------------ .../grpc/files/grpc-1.11.0-pkgconfig-libdir.patch | 17 +++++++ .../files/grpc-1.13.0-fix-host-ar-handling.patch | 47 +++++++++++++++++++ .../files/grpc-1.21.0-fix-host-ar-handling.patch | 47 +++++++++++++++++++ ...grpc-1.22.0-cxx_arg_list_too_long_forloop.patch | 44 ++++++++++++++++++ .../grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch | 53 ++++++++++++++++++++++ net-libs/grpc/grpc-1.16.1.ebuild | 6 +-- net-libs/grpc/grpc-1.17.1.ebuild | 6 +-- net-libs/grpc/grpc-1.18.0.ebuild | 6 +-- net-libs/grpc/grpc-1.19.0.ebuild | 6 +-- net-libs/grpc/grpc-1.20.1-r1.ebuild | 6 +-- net-libs/grpc/grpc-1.21.1-r1.ebuild | 6 +-- net-libs/grpc/grpc-1.22.0.ebuild | 8 ++-- 17 files changed, 230 insertions(+), 230 deletions(-) delete mode 100644 net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch delete mode 100644 net-libs/grpc/files/0003-grpc-1.3.0-Don-t-run-ldconfig.patch delete mode 100644 net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch delete mode 100644 net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch delete mode 100644 net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch create mode 100644 net-libs/grpc/files/grpc-1.11.0-pkgconfig-libdir.patch create mode 100644 net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch create mode 100644 net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch create mode 100644 net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch create mode 100644 net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch (limited to 'net-libs/grpc') diff --git a/net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch b/net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch deleted file mode 100644 index 926952f47f2a..000000000000 --- a/net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 7e2d98df390787797fa494b26c72896f16f6e2a6 Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev -Date: Sat, 30 Jun 2018 00:21:53 -0700 -Subject: [PATCH] Makefile: fix host ar handling - -Cherry picked lines from -https://github.com/grpc/grpc/pull/11476 ---- - Makefile | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 8333858588..b5a44b7096 100644 ---- a/Makefile -+++ b/Makefile -@@ -328,6 +328,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 -@@ -444,6 +445,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. -@@ -6886,10 +6888,10 @@ $(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 $@" -+ $(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 --- -2.18.0 - diff --git a/net-libs/grpc/files/0003-grpc-1.3.0-Don-t-run-ldconfig.patch b/net-libs/grpc/files/0003-grpc-1.3.0-Don-t-run-ldconfig.patch deleted file mode 100644 index d18063f2ef1b..000000000000 --- a/net-libs/grpc/files/0003-grpc-1.3.0-Don-t-run-ldconfig.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 40f602c0beeb09197507d280b150174e09300d7f Mon Sep 17 00:00:00 2001 -From: Chirantan Ekbote -Date: Mon, 10 Jul 2017 13:26:04 -0700 -Subject: [PATCH 5/5] grpc-1.3.0: Don't run ldconfig - -It doesn't make sense to run ldconfig for a staged install. Remove it. ---- - Makefile | 15 --------------- - 1 file changed, 15 deletions(-) - -diff --git a/Makefile b/Makefile -index 86bd66a5e0..f4c2a5bcb9 100644 ---- a/Makefile -+++ b/Makefile -@@ -2582,11 +2582,6 @@ else ifneq ($(SYSTEM),Darwin) - $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_unsecure.so.3 - $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_unsecure.so - endif --ifneq ($(SYSTEM),MINGW32) --ifneq ($(SYSTEM),Darwin) -- $(Q) ldconfig || true --endif --endif - - - install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-config_cxx -@@ -2635,11 +2630,6 @@ else ifneq ($(SYSTEM),Darwin) - $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.1 - $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so - endif --ifneq ($(SYSTEM),MINGW32) --ifneq ($(SYSTEM),Darwin) -- $(Q) ldconfig || true --endif --endif - - - install-shared_csharp: shared_csharp strip-shared_csharp -@@ -2652,11 +2642,6 @@ else ifneq ($(SYSTEM),Darwin) - $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_csharp_ext.so.1 - $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_csharp_ext.so - endif --ifneq ($(SYSTEM),MINGW32) --ifneq ($(SYSTEM),Darwin) -- $(Q) ldconfig || true --endif --endif - - - install-plugins: $(PROTOC_PLUGINS) --- -2.14.0.rc0.284.gd933b75aa4-goog - diff --git a/net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch b/net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch deleted file mode 100644 index 257bef8aa140..000000000000 --- a/net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/Makefile 2018-05-28 17:59:34.631540261 +0800 -+++ b/Makefile 2018-05-28 18:01:31.266936000 +0800 -@@ -460,11 +460,11 @@ - CACHE_MK += HAS_PKG_CONFIG = true, - endif - --CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) -+CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) - --CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) -+CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) - --CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) -+CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) - - ifeq ($(SYSTEM),MINGW32) - EXECUTABLE_SUFFIX = .exe 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 deleted file mode 100644 index 213a39a38438..000000000000 --- a/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 913486fddb5c2600f6ff83e549ee25e67579666f Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev -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 diff --git a/net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch b/net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch deleted file mode 100644 index 974d6fcc4351..000000000000 --- a/net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/Makefile 2018-06-26 11:07:45.948160976 +0200 -+++ b/Makefile 2019-06-26 11:04:25.798966336 +0200 -@@ -2820,13 +2820,15 @@ - - install-headers_c: - $(E) "[INSTALL] Installing public C headers" -- $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1 -- $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1 -+ $(Q) for h in $(PUBLIC_HEADERS_C); do \ -+ $(INSTALL) -D $$h $(prefix)/$$h ; \ -+ done - - install-headers_cxx: - $(E) "[INSTALL] Installing public C++ headers" -- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1 -- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1 -+ $(Q) for h in $(PUBLIC_HEADERS_CXX); do \ -+ $(INSTALL) -D $$h $(prefix)/$$h ; \ -+ done - - install-static: install-static_c install-static_cxx - ---- a/templates/Makefile.template 2019-06-26 12:38:36.777292299 +0200 -+++ b/templates/Makefile.template 2019-06-26 12:48:35.668550020 +0200 -@@ -1302,13 +1302,15 @@ - - install-headers_c: - $(E) "[INSTALL] Installing public C headers" -- $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1 -- $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1 -+ $(Q) for h in $(PUBLIC_HEADERS_C); do \ -+ $(INSTALL) -D $$h $(prefix)/$$h ; \ -+ done - - install-headers_cxx: - $(E) "[INSTALL] Installing public C++ headers" -- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1 -- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1 -+ $(Q) for h in $(PUBLIC_HEADERS_CXX); do \ -+ $(INSTALL) -D $$h $(prefix)/$$h ; \ -+ done - - install-static: install-static_c install-static_cxx - diff --git a/net-libs/grpc/files/grpc-1.11.0-pkgconfig-libdir.patch b/net-libs/grpc/files/grpc-1.11.0-pkgconfig-libdir.patch new file mode 100644 index 000000000000..257bef8aa140 --- /dev/null +++ b/net-libs/grpc/files/grpc-1.11.0-pkgconfig-libdir.patch @@ -0,0 +1,17 @@ +--- a/Makefile 2018-05-28 17:59:34.631540261 +0800 ++++ b/Makefile 2018-05-28 18:01:31.266936000 +0800 +@@ -460,11 +460,11 @@ + CACHE_MK += HAS_PKG_CONFIG = true, + endif + +-CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) ++CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) + +-CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) ++CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) + +-CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) ++CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) + + ifeq ($(SYSTEM),MINGW32) + EXECUTABLE_SUFFIX = .exe diff --git a/net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch b/net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch new file mode 100644 index 000000000000..926952f47f2a --- /dev/null +++ b/net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch @@ -0,0 +1,47 @@ +From 7e2d98df390787797fa494b26c72896f16f6e2a6 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Sat, 30 Jun 2018 00:21:53 -0700 +Subject: [PATCH] Makefile: fix host ar handling + +Cherry picked lines from +https://github.com/grpc/grpc/pull/11476 +--- + Makefile | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 8333858588..b5a44b7096 100644 +--- a/Makefile ++++ b/Makefile +@@ -328,6 +328,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 +@@ -444,6 +445,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. +@@ -6886,10 +6888,10 @@ $(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 $@" ++ $(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 +-- +2.18.0 + diff --git a/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch b/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch new file mode 100644 index 000000000000..213a39a38438 --- /dev/null +++ b/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch @@ -0,0 +1,47 @@ +From 913486fddb5c2600f6ff83e549ee25e67579666f Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +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 diff --git a/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch b/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch new file mode 100644 index 000000000000..974d6fcc4351 --- /dev/null +++ b/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch @@ -0,0 +1,44 @@ +--- a/Makefile 2018-06-26 11:07:45.948160976 +0200 ++++ b/Makefile 2019-06-26 11:04:25.798966336 +0200 +@@ -2820,13 +2820,15 @@ + + install-headers_c: + $(E) "[INSTALL] Installing public C headers" +- $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1 +- $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1 ++ $(Q) for h in $(PUBLIC_HEADERS_C); do \ ++ $(INSTALL) -D $$h $(prefix)/$$h ; \ ++ done + + install-headers_cxx: + $(E) "[INSTALL] Installing public C++ headers" +- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1 +- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1 ++ $(Q) for h in $(PUBLIC_HEADERS_CXX); do \ ++ $(INSTALL) -D $$h $(prefix)/$$h ; \ ++ done + + install-static: install-static_c install-static_cxx + +--- a/templates/Makefile.template 2019-06-26 12:38:36.777292299 +0200 ++++ b/templates/Makefile.template 2019-06-26 12:48:35.668550020 +0200 +@@ -1302,13 +1302,15 @@ + + install-headers_c: + $(E) "[INSTALL] Installing public C headers" +- $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1 +- $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1 ++ $(Q) for h in $(PUBLIC_HEADERS_C); do \ ++ $(INSTALL) -D $$h $(prefix)/$$h ; \ ++ done + + install-headers_cxx: + $(E) "[INSTALL] Installing public C++ headers" +- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1 +- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1 ++ $(Q) for h in $(PUBLIC_HEADERS_CXX); do \ ++ $(INSTALL) -D $$h $(prefix)/$$h ; \ ++ done + + install-static: install-static_c install-static_cxx + diff --git a/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch b/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch new file mode 100644 index 000000000000..d18063f2ef1b --- /dev/null +++ b/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch @@ -0,0 +1,53 @@ +From 40f602c0beeb09197507d280b150174e09300d7f Mon Sep 17 00:00:00 2001 +From: Chirantan Ekbote +Date: Mon, 10 Jul 2017 13:26:04 -0700 +Subject: [PATCH 5/5] grpc-1.3.0: Don't run ldconfig + +It doesn't make sense to run ldconfig for a staged install. Remove it. +--- + Makefile | 15 --------------- + 1 file changed, 15 deletions(-) + +diff --git a/Makefile b/Makefile +index 86bd66a5e0..f4c2a5bcb9 100644 +--- a/Makefile ++++ b/Makefile +@@ -2582,11 +2582,6 @@ else ifneq ($(SYSTEM),Darwin) + $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_unsecure.so.3 + $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_unsecure.so + endif +-ifneq ($(SYSTEM),MINGW32) +-ifneq ($(SYSTEM),Darwin) +- $(Q) ldconfig || true +-endif +-endif + + + install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-config_cxx +@@ -2635,11 +2630,6 @@ else ifneq ($(SYSTEM),Darwin) + $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.1 + $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so + endif +-ifneq ($(SYSTEM),MINGW32) +-ifneq ($(SYSTEM),Darwin) +- $(Q) ldconfig || true +-endif +-endif + + + install-shared_csharp: shared_csharp strip-shared_csharp +@@ -2652,11 +2642,6 @@ else ifneq ($(SYSTEM),Darwin) + $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_csharp_ext.so.1 + $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_csharp_ext.so + endif +-ifneq ($(SYSTEM),MINGW32) +-ifneq ($(SYSTEM),Darwin) +- $(Q) ldconfig || true +-endif +-endif + + + install-plugins: $(PROTOC_PLUGINS) +-- +2.14.0.rc0.284.gd933b75aa4-goog + diff --git a/net-libs/grpc/grpc-1.16.1.ebuild b/net-libs/grpc/grpc-1.16.1.ebuild index f04778edda6d..6ab28ceba67a 100644 --- a/net-libs/grpc/grpc-1.16.1.ebuild +++ b/net-libs/grpc/grpc-1.16.1.ebuild @@ -30,9 +30,9 @@ DEPEND="${RDEPEND} " PATCHES=( - "${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch" - "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch" - "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch" + "${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch" + "${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch" + "${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch" "${FILESDIR}/grpc-1.15.0-fix-cpp-so-version.patch" "${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch" "${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch" diff --git a/net-libs/grpc/grpc-1.17.1.ebuild b/net-libs/grpc/grpc-1.17.1.ebuild index 2774a877762b..a5959280313b 100644 --- a/net-libs/grpc/grpc-1.17.1.ebuild +++ b/net-libs/grpc/grpc-1.17.1.ebuild @@ -33,9 +33,9 @@ DEPEND="${RDEPEND} RESTRICT="test" PATCHES=( - "${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch" - "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch" - "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch" + "${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch" + "${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch" + "${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch" "${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch" "${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch" ) diff --git a/net-libs/grpc/grpc-1.18.0.ebuild b/net-libs/grpc/grpc-1.18.0.ebuild index 2774a877762b..a5959280313b 100644 --- a/net-libs/grpc/grpc-1.18.0.ebuild +++ b/net-libs/grpc/grpc-1.18.0.ebuild @@ -33,9 +33,9 @@ DEPEND="${RDEPEND} RESTRICT="test" PATCHES=( - "${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch" - "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch" - "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch" + "${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch" + "${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch" + "${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch" "${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch" "${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch" ) diff --git a/net-libs/grpc/grpc-1.19.0.ebuild b/net-libs/grpc/grpc-1.19.0.ebuild index d944be59c386..a0877fb616b1 100644 --- a/net-libs/grpc/grpc-1.19.0.ebuild +++ b/net-libs/grpc/grpc-1.19.0.ebuild @@ -33,9 +33,9 @@ DEPEND="${RDEPEND} RESTRICT="test" PATCHES=( - "${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch" - "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch" - "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch" + "${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch" + "${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch" + "${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch" "${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch" ) S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/net-libs/grpc/grpc-1.20.1-r1.ebuild b/net-libs/grpc/grpc-1.20.1-r1.ebuild index f34a772f7781..d8c812cd259b 100644 --- a/net-libs/grpc/grpc-1.20.1-r1.ebuild +++ b/net-libs/grpc/grpc-1.20.1-r1.ebuild @@ -33,9 +33,9 @@ DEPEND="${RDEPEND} RESTRICT="test" PATCHES=( - "${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch" - "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch" - "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch" + "${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch" + "${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch" + "${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch" "${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch" ) S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/net-libs/grpc/grpc-1.21.1-r1.ebuild b/net-libs/grpc/grpc-1.21.1-r1.ebuild index f90bab18e1c5..bf11250c29cb 100644 --- a/net-libs/grpc/grpc-1.21.1-r1.ebuild +++ b/net-libs/grpc/grpc-1.21.1-r1.ebuild @@ -32,9 +32,9 @@ BDEPEND="virtual/pkgconfig" RESTRICT="test" PATCHES=( - "${FILESDIR}/1.21.0-fix-host-ar-handling.patch" - "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch" - "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch" + "${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch" + "${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch" + "${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch" "${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch" ) diff --git a/net-libs/grpc/grpc-1.22.0.ebuild b/net-libs/grpc/grpc-1.22.0.ebuild index 04e137d8d78c..4f597ba83570 100644 --- a/net-libs/grpc/grpc-1.22.0.ebuild +++ b/net-libs/grpc/grpc-1.22.0.ebuild @@ -32,10 +32,10 @@ BDEPEND="virtual/pkgconfig" RESTRICT="test" PATCHES=( - "${FILESDIR}/1.21.0-fix-host-ar-handling.patch" - "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch" - "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch" - "${FILESDIR}/1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844 + "${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch" + "${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch" + "${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch" + "${FILESDIR}/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844 ) S="${WORKDIR}/${PN}-${MY_PV}" -- cgit v1.2.3-65-gdbad