From f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 30 Sep 2020 17:27:54 +0100 Subject: gentoo resync : 30.09.2020 --- .../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.25.0-pkgconfig-libdir.patch | 17 ------- .../grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch | 53 ---------------------- .../grpc/files/use-pkg-config-to-find-re2.patch | 26 +++++++++++ 5 files changed, 26 insertions(+), 161 deletions(-) delete mode 100644 net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch delete mode 100644 net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch delete mode 100644 net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch delete mode 100644 net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch create mode 100644 net-libs/grpc/files/use-pkg-config-to-find-re2.patch (limited to 'net-libs/grpc/files') 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 deleted file mode 100644 index 213a39a38438..000000000000 --- a/net-libs/grpc/files/grpc-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/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 deleted file mode 100644 index 974d6fcc4351..000000000000 --- a/net-libs/grpc/files/grpc-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.25.0-pkgconfig-libdir.patch b/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch deleted file mode 100644 index 28088713e5f8..000000000000 --- a/net-libs/grpc/files/grpc-1.25.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: $(PC_REQUIRES),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: $(PC_REQUIRES),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: $(PC_REQUIRES),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: $(PC_REQUIRES),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: $(PC_REQUIRES),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: $(PC_REQUIRES),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.3.0-Don-t-run-ldconfig.patch b/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch deleted file mode 100644 index d18063f2ef1b..000000000000 --- a/net-libs/grpc/files/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/use-pkg-config-to-find-re2.patch b/net-libs/grpc/files/use-pkg-config-to-find-re2.patch new file mode 100644 index 000000000000..33712d62ef01 --- /dev/null +++ b/net-libs/grpc/files/use-pkg-config-to-find-re2.patch @@ -0,0 +1,26 @@ +From 1f51d47b0ab2c0ac54c27b54f5e8e79910138a02 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Fri, 25 Sep 2020 15:10:26 -0700 +Subject: [PATCH] use pkg-config to find re2 + +--- + cmake/re2.cmake | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/cmake/re2.cmake b/cmake/re2.cmake +index 3e83aae..94dfa5d 100644 +--- a/cmake/re2.cmake ++++ b/cmake/re2.cmake +@@ -45,7 +45,8 @@ if(gRPC_RE2_PROVIDER STREQUAL "module") + set(gRPC_INSTALL FALSE) + endif() + elseif(gRPC_RE2_PROVIDER STREQUAL "package") +- find_package(re2 REQUIRED CONFIG) ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(RE2 REQUIRED re2) + + if(TARGET re2::re2) + set(_gRPC_RE2_LIBRARIES re2::re2) +-- +2.28.0 + -- cgit v1.2.3