From 7d234af969f1bd8037b498ddb44ceb2b516c68a9 Mon Sep 17 00:00:00 2001 From: Georgy Yakovlev Date: Fri, 15 Nov 2019 15:52:13 -0800 Subject: net-libs/grpc: bump to 1.25.0 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Georgy Yakovlev --- net-libs/grpc/Manifest | 1 + .../grpc/files/grpc-1.25.0-pkgconfig-libdir.patch | 17 ++++ net-libs/grpc/grpc-1.25.0.ebuild | 112 +++++++++++++++++++++ 3 files changed, 130 insertions(+) create mode 100644 net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch create mode 100644 net-libs/grpc/grpc-1.25.0.ebuild diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest index 1254f6798c1a..c347eb0907d4 100644 --- a/net-libs/grpc/Manifest +++ b/net-libs/grpc/Manifest @@ -7,3 +7,4 @@ DIST grpc-1.21.1.tar.gz 15043553 BLAKE2B bed23af6606a69eb02a033d5dd6d92e3e080cc6 DIST grpc-1.22.1.tar.gz 15083781 BLAKE2B 5f1bc2fc638cfa2f97df9dfba3c927ae0c7871b9e56f8012795000c30f20fa4d5c1bad37d117cf8ea54fb372b8b02702a866c027c6e0a467f276a752ee9d17c6 SHA512 086ceb7a4fc1439bd23a2cab8c90ba2542491d5a9c278a0ff6e1b3ad623cf7725b2a7310bb793d9b36882bd9394d02a3616331ac26c78d822e68b305c2ae27f6 DIST grpc-1.23.0.tar.gz 15212436 BLAKE2B 119a62e6573a1c7785934f7752d9bf2fc0f503a268e439ce143d6730994e3fc154ffd558a2fb3776a77f5f36798baac334f50d1c612ae5564c3c2f110df8b42c SHA512 4770651bd73b71735152155327c44d59125442b405157ffea8fb80b6f16406dd388474394e44ef620e2a777018121988a3a7a552a42141650d7cac263ab499a0 DIST grpc-1.24.3.tar.gz 15364420 BLAKE2B 7a1262ee931c2578399e7373e25fefb7a4329a2c0f139b17fbd4073406a931730393016455ff3ddee8b686ebb7903a898ca532972f57369c7658c68643b6d715 SHA512 19afa8b1fd64c429317c85d8cf42d01af0ac6aec82508740c176e1fd4f92dea9531ea9812523215ed67466bae93a75e14dc34cd9cce5987a13c0104e0313c69c +DIST grpc-1.25.0.tar.gz 16460163 BLAKE2B a581b1db459468e7c01af579da39cc111825931eee21d9af13833b1d65e448ee2024d86edb95e7acb705ad427f793d7911d6fb66418155e75f5e1f0e6116578a SHA512 7d9e126eafdfefe9b5c2eacf9c082b972115f231a55cff53386305f2df68037e2593eedc3f27fe0eaeb7fbe78b28f6b87607cdeccf59929b9a9b33bf74ab5c92 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 new file mode 100644 index 000000000000..28088713e5f8 --- /dev/null +++ b/net-libs/grpc/files/grpc-1.25.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: $(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/grpc-1.25.0.ebuild b/net-libs/grpc/grpc-1.25.0.ebuild new file mode 100644 index 000000000000..0a1213a0a715 --- /dev/null +++ b/net-libs/grpc/grpc-1.25.0.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +MY_PV="${PV//_pre/-pre}" + +DESCRIPTION="Modern open source high performance RPC framework" +HOMEPAGE="https://www.grpc.io" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="examples doc perftools systemtap static-libs" + +DEPEND=" + >=dev-libs/openssl-1.0.2:0=[-bindist] + >=dev-libs/protobuf-3.8.0:= + >=net-dns/c-ares-1.15.0:= + sys-libs/zlib:= + perftools? ( dev-util/google-perftools:= ) + systemtap? ( dev-util/systemtap ) +" + +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +# requires network +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch" + "${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch" + "${FILESDIR}/grpc-1.25.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}" + +src_prepare() { + rm -r third_party/cares || die + sed -i 's:-Werror::g' Makefile || die + sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir" + + default +} + +src_compile() { + tc-export CC CXX PKG_CONFIG + + local myemakeargs=( + V=1 + prefix=/usr + INSTALL_LIBDIR="$(get_libdir)" + AR="$(tc-getAR)" + AROPTS="rcs" + CFLAGS="${CFLAGS}" + CXXFLAGS="${CXXFLAGS}" + LD="${CC}" + LDXX="${CXX}" + STRIP=/bin/true + HOST_AR="$(tc-getBUILD_AR)" + HOST_CC="$(tc-getBUILD_CC)" + HOST_CXX="$(tc-getBUILD_CXX)" + HOST_LD="$(tc-getBUILD_CC)" + HOST_LDXX="$(tc-getBUILD_CXX)" + HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)" + HAS_SYSTEMTAP="$(usex systemtap true false)" + ) + + emake "${myemakeargs[@]}" +} + +src_install() { + local myemakeargs=( + V=1 + prefix="${ED}"/usr + INSTALL_LIBDIR="$(get_libdir)" + STRIP=/bin/true + ) + + emake "${myemakeargs[@]}" install + + use static-libs || find "${ED}" -name '*.a' -delete + + if use examples; then + find examples -name '.gitignore' -delete || die + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi + + if use doc; then + find doc -name '.gitignore' -delete || die + local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. ) + fi + + einstalldocs +} + +pkg_postinst() { + local v + for v in ${REPLACING_VERSIONS}; do + if ver_test "${v}" -lt 1.16.0; then + ewarn "python bindings and tools moved to separate independent packages" + ewarn "check dev-python/grpcio and dev-python/grpcio-tools" + fi + done + +} -- cgit v1.2.3-65-gdbad