[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/, net-libs/grpc/files/
commit: 4400448333c4b50ef50e89c5c984849c1f88f4ea Author: Georgy Yakovlev gentoo org> AuthorDate: Mon Jun 21 23:33:12 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Jun 21 23:33:20 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44004483 net-libs/grpc: drop 1.28.1-r2, 1.32.0-r1 Signed-off-by: Georgy Yakovlev gentoo.org> net-libs/grpc/Manifest | 2 - .../grpc/files/use-pkg-config-to-find-re2.patch| 26 --- net-libs/grpc/grpc-1.28.1-r2.ebuild| 72 -- net-libs/grpc/grpc-1.32.0-r1.ebuild| 86 -- 4 files changed, 186 deletions(-) diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest index b436c49344c..32327daee54 100644 --- a/net-libs/grpc/Manifest +++ b/net-libs/grpc/Manifest @@ -1,4 +1,2 @@ -DIST grpc-1.28.1.tar.gz 6888015 BLAKE2B 92d6f4a655183d34979c668bb7f4187a6670aa8ff5609df7b19fc7cadb57756fdc2322e57ef328623b1d91e63d8891ec0154ccef827c0302c14d986c6d9d179f SHA512 5cc4993470e2df21447d032ddeb65ab4175bb8acad5a06fdd22564068b80a5be255ef0e44d36732642d39dc3eaec02a93d2aaf6e369ad5dc43ff99b5023f357b -DIST grpc-1.32.0.tar.gz 7174251 BLAKE2B 4ea1b2d6a92f71e0d3703b350778fa4ae78eaeefe4f9052b649abb42e3d5e02e0220695ce2ef52eaf4ecec4194d024bf1ce7a33d52594557c7cceec5b5a3c069 SHA512 90136042327cea4e3680e19484f23cc00322914a7aae7987bf00b6e0901721d14c487555fdd94888192d6beb950172361ac57fbd02d43b40552f7ff5cac442ed DIST grpc-1.37.1.tar.gz 8212731 BLAKE2B c306fbe60f5191fe957efb35c75574e00b194895e7d116a1d0a47238b53e73055e7c173e69afcf97b77e593f55001141bbef8fb09b9787420203d935eb85 SHA512 fe02447f558116e9ed2de48142b9bd3b8908d496aea7816406eee2c6ad136714ee14c2104a82a32f56ab486c5050b4665c55bacb24c91ceabcf1b998a5fc86b7 DIST grpc-1.38.1.tar.gz 8294961 BLAKE2B dca22ef4517ad122815522985e0d1c9b35789302056ea896c3ccc1163725835cf1f925b344467185edd6c86a65808bbe8243721834c0fd4f209216109b7c2fe7 SHA512 1f9b6baea4790836d32da6a27ec1491c015d47f2a48ef8732dada0ef45f4dfed412597c8a09dfc0778b16c7300618d42013679094e05cb5922bfae57adedaaa2 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 deleted file mode 100644 index 33712d62ef0..000 --- a/net-libs/grpc/files/use-pkg-config-to-find-re2.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 - diff --git a/net-libs/grpc/grpc-1.28.1-r2.ebuild b/net-libs/grpc/grpc-1.28.1-r2.ebuild deleted file mode 100644 index 92abfe8d56e..000 --- a/net-libs/grpc/grpc-1.28.1-r2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -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="doc examples" - -DEPEND=" - =dev-cpp/abseil-cpp-20200225*:= - >=dev-libs/protobuf-3.11.2:= - >=net-dns/c-ares-1.15.0:= - sys-libs/zlib:= - >=dev-libs/openssl-1.0.2:0=[-bindist(-)] -" - -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -# requires git checkouts of google tools -RESTRICT="test" - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_prepare() { - cmake_src_prepare - - # un-hardcode libdir - sed -i "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" CMakeLists.txt || die - sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die -} - -src_configure() { - local mycmakeargs=( - -DgRPC_INSTALL=ON - -DgRPC_ABSL_PROVIDER=package - -DgRPC_CARES_PROVIDER=package - -DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}" - -DgRPC_INSTALL_LIBDIR="$(get_libdir)" - -DgRPC_PROTOBUF_PROVIDER=package - -DgRPC_SSL_PROVIDER=package - -DgRPC_ZLIB_PROVIDER=package - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use examples; then - find examples -name '.gitignore' -delete || die - dodoc -r examples -
[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/, net-libs/grpc/files/
commit: 1b494f9534d644a0c3192d6da4dfb56fa180ca16 Author: Georgy Yakovlev gentoo org> AuthorDate: Mon Apr 20 16:27:01 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Apr 20 16:27:39 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b494f95 net-libs/grpc: drop old Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev gentoo.org> net-libs/grpc/Manifest | 3 - .../grpc/files/grpc-1.11.0-pkgconfig-libdir.patch | 17 .../grpc/files/grpc-1.22.1-glibc-2.30-compat.patch | 78 -- net-libs/grpc/grpc-1.22.1.ebuild | 113 - net-libs/grpc/grpc-1.23.0.ebuild | 113 - net-libs/grpc/grpc-1.24.3.ebuild | 112 6 files changed, 436 deletions(-) diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest index daef11ad77e..d5b1a49aa2e 100644 --- a/net-libs/grpc/Manifest +++ b/net-libs/grpc/Manifest @@ -1,6 +1,3 @@ -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.26-fix-odr-violation.patch.bz2 6320 BLAKE2B d7551a54c7a846cd8545a9cb0204e28f1d94b6a0a28b9093be1337127e76256c29e2ff9739ef1791740371d4b30520305c3c5908216030f4b23488c250248256 SHA512 c020eb40a3a494f8ef4a0ab6efc7a832c844c365d006a1d9512f0451af4ff33a11a185cd0ecd1afa0c546b190efcf8a0fef9e543f8fac35e65da10a2df34cd61 DIST grpc-1.26.0.tar.gz 16673794 BLAKE2B f72d1997366e5e6e8b6b554149f90a187cbaea65da0070f4525739db38c053c6b280509f2faf2ec0e283ab9b7d000efda46b90b18143cd5ef8c1ec0881e00d3d SHA512 4f7d067c582d0a9be7b7d4dd1e08acdbe6ff0686dfe92b5db5b7927f779410a4237acfd1c61d9f79eb2d00f86cf93cc7492fa372c1877e57c1aa23e9bb2648bb DIST grpc-1.28.1.tar.gz 6888015 BLAKE2B 92d6f4a655183d34979c668bb7f4187a6670aa8ff5609df7b19fc7cadb57756fdc2322e57ef328623b1d91e63d8891ec0154ccef827c0302c14d986c6d9d179f SHA512 5cc4993470e2df21447d032ddeb65ab4175bb8acad5a06fdd22564068b80a5be255ef0e44d36732642d39dc3eaec02a93d2aaf6e369ad5dc43ff99b5023f357b 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 deleted file mode 100644 index 257bef8aa14..000 --- a/net-libs/grpc/files/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:
[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/, net-libs/grpc/files/
commit: 0c166b62ae2b58ba392efc691fc03ab3d96b42cc Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Feb 5 20:06:54 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Feb 5 20:12:30 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c166b62 net-libs/grpc: drop old Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> net-libs/grpc/Manifest | 6 -- .../files/grpc-1.13.0-fix-host-ar-handling.patch | 47 - .../files/grpc-1.15.0-fix-cpp-so-version.patch | 70 - ...0-Prevent-shell-calls-longer-than-ARG_MAX.patch | 70 - net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch | 46 - net-libs/grpc/grpc-1.16.1.ebuild | 103 --- net-libs/grpc/grpc-1.17.1.ebuild | 107 net-libs/grpc/grpc-1.18.0.ebuild | 107 net-libs/grpc/grpc-1.19.0.ebuild | 105 --- net-libs/grpc/grpc-1.20.1-r1.ebuild| 105 --- net-libs/grpc/grpc-1.21.1-r1.ebuild| 112 - 11 files changed, 878 deletions(-) diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest index f2e57404f31..db9c792391c 100644 --- a/net-libs/grpc/Manifest +++ b/net-libs/grpc/Manifest @@ -1,9 +1,3 @@ -DIST grpc-1.16.1.tar.gz 14442310 BLAKE2B 7ee9dc8f146a11009024786f3aa80205eb9a29576dd96fe719b7417eafcdacab703f0eaa73f009c98a54968c4d6079f612fa2b581e236d12fd55013c7c01fd5f SHA512 2bfc3aba316eac7d741944826a5cd4de6aa6ccf05e8023383cb9d8cd374ff1961c75b0371edf088d47c8a797ed64c35bd64b7b22f388a62ece9ecef55f4ea56d -DIST grpc-1.17.1.tar.gz 14626262 BLAKE2B ce44f15bfb7f8cb9b7f0f2a1919d218a99dbc4c599d912459c2b5ca46b386b2446018f22d0d28886769dec16b5eadb8140b78e584ecfd5bb2cc6aa63dcb45ece SHA512 45ba731fd4d1bc3cf590511e53ea6a73de6970f4bb379eb0ef90d550cdc13358f673ead8c6877c02c71dccdba914ad4765c58e173e0dd7895b5d25ebbad38e8e -DIST grpc-1.18.0.tar.gz 14690365 BLAKE2B ec2992e3b80ca10f9d0250510930d4f2b5f7a9593a8245927aafe77b29b028e4a4a2f32162af08fd4e2077d48b9e0e32e772901f5f524247f7d6910e74c2a120 SHA512 2489860a395b9f59d4eb81db5a8d873683e317145ad140b72fabb13693e166c122ce8526d34e2380a52d18493e8b2b49d6d28e53878af2c43523a5791da8fe52 -DIST grpc-1.19.0.tar.gz 14793251 BLAKE2B b3a3db91f6c54126a51e27bd474d05bc672c5f71f131581ddea60ded64b247d69bdc4edcc974cbce7af71e78c4579a7b6ad0c618ac3aeb9b0ff7743b039658f7 SHA512 6a61373e5c407ee147ea755b9992f96801695d0b94e6d34305fc09afe9987ae6d4a70a0757bd903734f549604bda26b41582e6938b1654598429abc4cc3a3b90 -DIST grpc-1.20.1.tar.gz 14930355 BLAKE2B 5b1bf2250d2b052498cfad9fc96134fd9b0065c98d73957427347aff4fe170f9a3d323c9f8797311c570a25bd9ff79f80da610e32b638c6409d2cd5dfbeb4eef SHA512 e0dd0318d2b4ec07e0eafffa218938d91b1440c5053a557460ea7fceaab3d76f01d595abe7de9fa79f068b71cfbc5a28a3b688bc9c1e2737086928149583 -DIST grpc-1.21.1.tar.gz 15043553 BLAKE2B bed23af6606a69eb02a033d5dd6d92e3e080cc68ddae3c700872b8036cab594fd79c2396eb4ac84df2c5ea9eaf5ec0401d820667a7de0e9e2b376c0df4d4e9c5 SHA512 b9ea81a97416d9c1ef4d49e5f222f309b00d383f643f3bf342b6ad97f88e08e212e19db75e4a74fc5c23799dbe76dd0a9d6d4c9310e8cb1e007622a78d7a7114 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 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 deleted file mode 100644 index 926952f47f2..000 --- a/net-libs/grpc/files/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) -
[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/, net-libs/grpc/files/
commit: bf6b4895ed89ae2061d7f42487b269d25bbb956b Author: Georgy Yakovlev gentoo org> AuthorDate: Sat Aug 17 02:15:26 2019 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Aug 17 02:59:49 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf6b4895 net-libs/grpc: bump to 1.23.0 Bug: https://bugs.gentoo.org/692012 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Georgy Yakovlev gentoo.org> net-libs/grpc/Manifest | 1 + .../grpc/files/grpc-1.22.1-glibc-2.30-compat.patch | 78 ++ net-libs/grpc/grpc-1.23.0.ebuild | 113 + 3 files changed, 192 insertions(+) diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest index f80ec4ac5af..e210b147a9e 100644 --- a/net-libs/grpc/Manifest +++ b/net-libs/grpc/Manifest @@ -5,3 +5,4 @@ DIST grpc-1.19.0.tar.gz 14793251 BLAKE2B b3a3db91f6c54126a51e27bd474d05bc672c5f7 DIST grpc-1.20.1.tar.gz 14930355 BLAKE2B 5b1bf2250d2b052498cfad9fc96134fd9b0065c98d73957427347aff4fe170f9a3d323c9f8797311c570a25bd9ff79f80da610e32b638c6409d2cd5dfbeb4eef SHA512 e0dd0318d2b4ec07e0eafffa218938d91b1440c5053a557460ea7fceaab3d76f01d595abe7de9fa79f068b71cfbc5a28a3b688bc9c1e2737086928149583 DIST grpc-1.21.1.tar.gz 15043553 BLAKE2B bed23af6606a69eb02a033d5dd6d92e3e080cc68ddae3c700872b8036cab594fd79c2396eb4ac84df2c5ea9eaf5ec0401d820667a7de0e9e2b376c0df4d4e9c5 SHA512 b9ea81a97416d9c1ef4d49e5f222f309b00d383f643f3bf342b6ad97f88e08e212e19db75e4a74fc5c23799dbe76dd0a9d6d4c9310e8cb1e007622a78d7a7114 DIST grpc-1.22.0.tar.gz 15082718 BLAKE2B 679be0488fc02441d5ba555c9150532e6ceb00bbaee9fe8b22881bef8ab713f45f96283f123576738285cfe8d358eb458cac9252bac7766cfd8ee5ac6e97fda9 SHA512 e8181f01bc44dc7e7a9e8c74c0a9c3f25960bb9c88c239e7c75764105ca24ac173bab663130fb6349c7fa43cd57f35dd7927a369482b1e6a73224cb2174bd336 +DIST grpc-1.23.0.tar.gz 15212436 BLAKE2B 119a62e6573a1c7785934f7752d9bf2fc0f503a268e439ce143d6730994e3fc154ffd558a2fb3776a77f5f36798baac334f50d1c612ae5564c3c2f110df8b42c SHA512 4770651bd73b71735152155327c44d59125442b405157ffea8fb80b6f16406dd388474394e44ef620e2a777018121988a3a7a552a42141650d7cac263ab499a0 diff --git a/net-libs/grpc/files/grpc-1.22.1-glibc-2.30-compat.patch b/net-libs/grpc/files/grpc-1.22.1-glibc-2.30-compat.patch new file mode 100644 index 000..90bd9115893 --- /dev/null +++ b/net-libs/grpc/files/grpc-1.22.1-glibc-2.30-compat.patch @@ -0,0 +1,78 @@ +From d1d017390b799c59d6fdf7b8afa6136d218bdd61 Mon Sep 17 00:00:00 2001 +From: Benjamin Peterson +Date: Fri, 3 May 2019 08:11:00 -0700 +Subject: [PATCH] Rename gettid() functions. + +glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts. +--- + src/core/lib/gpr/log_linux.cc | 4 ++-- + src/core/lib/gpr/log_posix.cc | 4 ++-- + src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc +index 561276f0c20..8b597b4cf2f 100644 +--- a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc +@@ -40,7 +40,7 @@ + #include + #include + +-static long gettid(void) { return syscall(__NR_gettid); } ++static long sys_gettid(void) { return syscall(__NR_gettid); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) { + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + struct tm tm; + static __thread long tid = 0; +- if (tid == 0) tid = gettid(); ++ if (tid == 0) tid = sys_gettid(); + + timer = static_cast(now.tv_sec); + final_slash = strrchr(args->file, '/'); +diff --git a/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc +index b6edc14ab6b..2f7c6ce3760 100644 +--- a/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc +@@ -31,7 +31,7 @@ + #include + #include + +-static intptr_t gettid(void) { return (intptr_t)pthread_self(); } ++static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) { + char* prefix; + gpr_asprintf(, "%s%s.%09d %7" PRIdPTR " %s:%d]", +gpr_log_severity_string(args->severity), time_buffer, +- (int)(now.tv_nsec), gettid(), display_file, args->line); ++ (int)(now.tv_nsec), sys_gettid(), display_file, args->line); + + fprintf(stderr, "%-70s %s\n", prefix, args->message); + gpr_free(prefix); +diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc +index 08116b3ab53..76f59844312 100644 +--- a/src/core/lib/iomgr/ev_epollex_linux.cc
[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/, net-libs/grpc/files/
commit: f39ed9cf181d96f0cc120a898379c06b103bc83b Author: Georgy Yakovlev gentoo org> AuthorDate: Sun Oct 28 19:33:39 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sun Oct 28 19:33:39 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f39ed9cf net-libs/grpc: fix ARG_MAX install error Closes: https://bugs.gentoo.org/669730 Signed-off-by: Georgy Yakovlev gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 ...0-Prevent-shell-calls-longer-than-ARG_MAX.patch | 70 ++ net-libs/grpc/grpc-1.16.0.ebuild | 1 + 2 files changed, 71 insertions(+) diff --git a/net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch b/net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch new file mode 100644 index 000..fd9f9141954 --- /dev/null +++ b/net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch @@ -0,0 +1,70 @@ +From 0892788776d60d92a0cddcd22078779166b736db Mon Sep 17 00:00:00 2001 +From: Dario Berzano +Date: Thu, 5 Jul 2018 11:27:20 +0200 +Subject: [PATCH] Prevent shell calls longer than ARG_MAX + +This patch we breaks the relevant paths array into multiple shorter arrays in +order to make the shell calls succeed. + +See grpc/grpc#14844. +--- + Makefile | 16 + 1 file changed, 16 insertions(+) + +diff --git a/Makefile b/Makefile +index 54823a31167..25eb092d996 100644 +--- a/Makefile b/Makefile +@@ -2946,8 +2946,14 @@ install-headers_c: + + 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) $(foreach h, $(PUBLIC_HEADERS_CXX1), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1 ++ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX1), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1 ++ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX2), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1 ++ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX2), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1 ++ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX3), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1 ++ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX3), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1 ++ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX4), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1 ++ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX4), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1 + + install-static: install-static_c install-static_cxx + +@@ -5278,6 +5284,8 @@ PUBLIC_HEADERS_CXX += \ + include/grpc++/support/stub_options.h \ + include/grpc++/support/sync_stream.h \ + include/grpc++/support/time.h \ ++ ++PUBLIC_HEADERS_CXX1 += \ + include/grpcpp/alarm.h \ + include/grpcpp/channel.h \ + include/grpcpp/client_context.h \ +@@ -5325,6 +5333,8 @@ PUBLIC_HEADERS_CXX += \ + include/grpcpp/support/stub_options.h \ + include/grpcpp/support/sync_stream.h \ + include/grpcpp/support/time.h \ ++ ++PUBLIC_HEADERS_CXX2 += \ + include/grpc/support/alloc.h \ + include/grpc/support/atm.h \ + include/grpc/support/atm_gcc_atomic.h \ +@@ -5376,6 +5386,8 @@ PUBLIC_HEADERS_CXX += \ + include/grpc/impl/codegen/propagation_bits.h \ + include/grpc/impl/codegen/slice.h \ + include/grpc/impl/codegen/status.h \ ++ ++PUBLIC_HEADERS_CXX3 += \ + include/grpc++/impl/codegen/async_stream.h \ + include/grpc++/impl/codegen/async_unary_call.h \ + include/grpc++/impl/codegen/byte_buffer.h \ +@@ -5406,6 +5418,8 @@ PUBLIC_HEADERS_CXX += \ + include/grpc++/impl/codegen/stub_options.h \ + include/grpc++/impl/codegen/sync_stream.h \ + include/grpc++/impl/codegen/time.h \ ++ ++PUBLIC_HEADERS_CXX4 += \ + include/grpcpp/impl/codegen/async_generic_service.h \ + include/grpcpp/impl/codegen/async_stream.h \ + include/grpcpp/impl/codegen/async_unary_call.h \ diff --git a/net-libs/grpc/grpc-1.16.0.ebuild b/net-libs/grpc/grpc-1.16.0.ebuild index 31caf4ced50..b3fac81f326 100644 --- a/net-libs/grpc/grpc-1.16.0.ebuild +++ b/net-libs/grpc/grpc-1.16.0.ebuild @@ -35,6 +35,7 @@ PATCHES=( "${FILESDIR}/0005-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" ) S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/, net-libs/grpc/files/
commit: 92c71270024e7e9bf74eef6bd697eada65899c6c Author: Georgy Yakovlev gentoo org> AuthorDate: Mon Oct 22 00:34:55 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Oct 25 04:49:03 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92c71270 net-libs/grpc: version bump to 1.16.0 migrated python and tools useflags to dev-python/{grpcio,grpcio-tools} Signed-off-by: Georgy Yakovlev gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 net-libs/grpc/Manifest | 1 + net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch | 46 +++ net-libs/grpc/grpc-1.16.0.ebuild | 101 +++ 3 files changed, 148 insertions(+) diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest index 565aa5cecfb..6e6e8dc9326 100644 --- a/net-libs/grpc/Manifest +++ b/net-libs/grpc/Manifest @@ -4,5 +4,6 @@ DIST grpc-1.13.0.tar.gz 13755973 BLAKE2B 533f0a7d4eb606b8a55f12aade503285dbff2cf DIST grpc-1.13.1.tar.gz 13757818 BLAKE2B 9387efb980a0cff20c36d7653f24fb7982809428f7f35af0819786753d6cf380a581af81bde72f3682fcdfb3f41c71d628e5ef3b6b83663c8d3d182b4fdb6272 SHA512 f44028299d47865814ada2b8b93dc98dc51c8729bedc9c30dd79c04f6ecc3789ff06bbe7555e5d3512d9aec027751761ae10a80a09a94cf85bbd3260d651b356 DIST grpc-1.14.2.tar.gz 13891112 BLAKE2B 2d8baa2d248fb9e319ac6f1a9cb1eb0c4f7ce20cfaa51254cb6d43db8d101fd4df03779b24e52a2cd00d7e14a415d928d51039c31cdde2c3272feee664861ea1 SHA512 1fca05a01fcae3bcaa8aeb57fb8e4a69d92d4d4d42e0612e9a7b3652a3f4e1b006a7559aea95cadae614479f4ac6ed14876b81fca0365967d246a5b7888a8385 DIST grpc-1.15.0.tar.gz 14084394 BLAKE2B 133460868f347eb4bba6e761c2ad7d826017de4b3c52aafe1850a8a8811afb0a6ff3c084b5ff645556d0f14c7c60db89a9cb5dddfc9827b2ca2b32af09ecf43f SHA512 2a958d93bf737e074216b121bc8e65c9c5151e6f8cfd5a3e9f826413d2734fdcdbd5659482c8d0b2a5e9a4ae537f5c1dfb58ee8ecf844ec95fe46659fb937e06 +DIST grpc-1.16.0.tar.gz 14442543 BLAKE2B bceddb5cc9b3439523523f16e0a34b45ddcd1b4bfc00556639b6d0ea84b886c7a9b3204b73605181d76997b42ba1a3ec3ccb95f43a0396a5cb96c7ea7644a800 SHA512 af088500bb7055f91a856efc91a718f3363a3047bc568e6419dc5776037d9a20493772b34d75a78225fb6bfc339da6493881c6744f3f98607bf9d3c7f91bfb75 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839 diff --git a/net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch b/net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch new file mode 100644 index 000..0afd8254dec --- /dev/null +++ b/net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch @@ -0,0 +1,46 @@ +From 807a938a576ec52bc8c971100b2da26b059d9347 Mon Sep 17 00:00:00 2001 +From: Tobias Jungel +Date: Wed, 22 Aug 2018 21:14:46 +0200 +Subject: [PATCH 1/2] mitigate gcc8 -Werror=ignored-qualifiers + +--- + src/core/ext/transport/chttp2/transport/flow_control.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc +index 53932bcb7f5..4b1862735d6 100644 +--- a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc +@@ -190,7 +190,7 @@ TransportFlowControl::TransportFlowControl(const grpc_chttp2_transport* t, + uint32_t TransportFlowControl::MaybeSendUpdate(bool writing_anyway) { + FlowControlTrace trace("t updt sent", this, nullptr); + const uint32_t target_announced_window = +- static_cast(target_window()); ++ static_cast(target_window()); + if ((writing_anyway || announced_window_ <= target_announced_window / 2) && + announced_window_ != target_announced_window) { + const uint32_t announce = static_cast GPR_CLAMP( + +From 5a03e7f10145c6591f313055907a9cf26ccb9234 Mon Sep 17 00:00:00 2001 +From: Tobias Jungel +Date: Wed, 22 Aug 2018 21:17:01 +0200 +Subject: [PATCH 2/2] mitigate gcc8 -Werror=stringop-truncation + +--- + .../client_channel/lb_policy/grpclb/load_balancer_api.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +index f24281a5bfb..8c064214729 100644 +--- a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +@@ -68,7 +68,8 @@
[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/, net-libs/grpc/files/
commit: 6c95887964743f14f9af8b75929408df60691fc7 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Sep 12 18:37:36 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Sep 12 18:56:45 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c958879 net-libs/grpc: version bump to 1.14.2 Package-Manager: Portage-2.3.49, Repoman-2.3.10 net-libs/grpc/Manifest | 1 + net-libs/grpc/files/grpc-1.14.2-gcc8-fixes.patch | 83 +++ net-libs/grpc/grpc-1.14.2.ebuild | 173 +++ 3 files changed, 257 insertions(+) diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest index c694829ef8a..2f11312e5db 100644 --- a/net-libs/grpc/Manifest +++ b/net-libs/grpc/Manifest @@ -2,4 +2,5 @@ DIST grpc-1.12.0.tar.gz 13692310 BLAKE2B 86b9063416140453718c51df4f238bb3d5ac854 DIST grpc-1.12.1.tar.gz 13692045 BLAKE2B d35706b553917d0f27e4474509f361ec7962b738031f11ca814d7ec33429f848b3b3356cae9a28b9a0cb376df5a6348d312c80ed4eeb51b81e68b317584a2e4a SHA512 9dd6d8c4b4e2713cf27ed55b1e97fdf5ed6d80f43b798b83f08e2f4646387dfd0696b21d4f44dbd99a061d388790dc15da49ac5afb0bb06116cfd6f07b7d6962 DIST grpc-1.13.0.tar.gz 13755973 BLAKE2B 533f0a7d4eb606b8a55f12aade503285dbff2cfa29ff2af71d407e3df25f3ec4b7572335c455d5dd0069eb343f18f8641a4f9326065cc118922942f77d2d2403 SHA512 25a489cd67d12219696c397afa75282eb702bd0af418381990b2eeb4b56483a46276d05314710582dd17be04c80aaf9bb16e01e2c1729d9a59d84ff273baa254 DIST grpc-1.13.1.tar.gz 13757818 BLAKE2B 9387efb980a0cff20c36d7653f24fb7982809428f7f35af0819786753d6cf380a581af81bde72f3682fcdfb3f41c71d628e5ef3b6b83663c8d3d182b4fdb6272 SHA512 f44028299d47865814ada2b8b93dc98dc51c8729bedc9c30dd79c04f6ecc3789ff06bbe7555e5d3512d9aec027751761ae10a80a09a94cf85bbd3260d651b356 +DIST grpc-1.14.2.tar.gz 13891112 BLAKE2B 2d8baa2d248fb9e319ac6f1a9cb1eb0c4f7ce20cfaa51254cb6d43db8d101fd4df03779b24e52a2cd00d7e14a415d928d51039c31cdde2c3272feee664861ea1 SHA512 1fca05a01fcae3bcaa8aeb57fb8e4a69d92d4d4d42e0612e9a7b3652a3f4e1b006a7559aea95cadae614479f4ac6ed14876b81fca0365967d246a5b7888a8385 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181 diff --git a/net-libs/grpc/files/grpc-1.14.2-gcc8-fixes.patch b/net-libs/grpc/files/grpc-1.14.2-gcc8-fixes.patch new file mode 100644 index 000..cb61b5f26fe --- /dev/null +++ b/net-libs/grpc/files/grpc-1.14.2-gcc8-fixes.patch @@ -0,0 +1,83 @@ +From 9c7db45da9a6ddc5d65cd19704539579eb31d2ce Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Wed, 12 Sep 2018 10:35:45 -0700 +Subject: [PATCH] Fix failures with gcc-8 + +Based on this PR https://github.com/grpc/grpc/pull/15443 +--- + src/core/ext/filters/client_channel/client_channel.cc | 2 +- + .../client_channel/lb_policy/grpclb/load_balancer_api.cc | 3 ++- + src/core/ext/transport/chttp2/transport/flow_control.cc| 2 +- + src/core/lib/surface/channel.cc| 2 +- + src/core/tsi/alts_transport_security.cc| 2 +- + 5 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc +index d2bf4f388d..503fb1ac87 100644 +--- a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc +@@ -457,7 +457,7 @@ get_service_config_from_resolver_result_locked(channel_data* chand) { + grpc_uri* uri = grpc_uri_parse(server_uri, true); + GPR_ASSERT(uri->path[0] != '\0'); + service_config_parsing_state parsing_state; +-memset(_state, 0, sizeof(parsing_state)); ++memset(reinterpret_cast(_state), 0, sizeof(parsing_state)); + parsing_state.server_name = + uri->path[0] == '/' ? uri->path + 1 : uri->path; + service_config->ParseGlobalParams(parse_retry_throttle_params, +diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +index f24281a5bf..74baf430f1 100644 +--- a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +@@ -68,7 +68,8 @@ grpc_grpclb_request* grpc_grpclb_request_create(const char* lb_service_name) { + req->has_initial_request = true; + req->initial_request.has_name = true; + strncpy(req->initial_request.name, lb_service_name, +- GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH); ++ GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH-1); ++ req->initial_request.name[GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH] = '\0'; + return req; + } + +diff --git
[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/, net-libs/grpc/files/
commit: 3313f9953cbd4607e4ec6277f6565d53c9d8a300 Author: Jason Zaman gentoo org> AuthorDate: Mon May 28 10:33:36 2018 + Commit: Jason Zaman gentoo org> CommitDate: Mon May 28 10:33:36 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3313f995 net-libs/grpc: fix libdir in pkgconfig files Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch | 17 + .../grpc/{grpc-1.11.0.ebuild => grpc-1.11.0-r1.ebuild} | 2 ++ 2 files changed, 19 insertions(+) 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 new file mode 100644 index 000..257bef8aa14 --- /dev/null +++ b/net-libs/grpc/files/0005-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/grpc-1.11.0.ebuild b/net-libs/grpc/grpc-1.11.0-r1.ebuild similarity index 94% rename from net-libs/grpc/grpc-1.11.0.ebuild rename to net-libs/grpc/grpc-1.11.0-r1.ebuild index 1a6156e4625..a232297d5cf 100644 --- a/net-libs/grpc/grpc-1.11.0.ebuild +++ b/net-libs/grpc/grpc-1.11.0-r1.ebuild @@ -30,6 +30,7 @@ PATCHES=( "${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch" "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch" "${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch" + "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch" ) src_prepare() { @@ -42,6 +43,7 @@ src_compile() { emake \ V=1 \ prefix=/usr \ + INSTALL_LIBDIR="$(get_libdir)" \ AR="$(tc-getAR)" \ AROPTS="rcs" \ CFLAGS="${CFLAGS}" \
[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/, net-libs/grpc/files/
commit: 47c14d152f8d1e20021bd7c49ea3e4ccefb542b1 Author: Jason Zaman gentoo org> AuthorDate: Wed May 2 06:30:21 2018 + Commit: Jason Zaman gentoo org> CommitDate: Wed May 2 07:19:53 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47c14d15 net-libs/grpc: new package Updated from CrOS overlay Package-Manager: Portage-2.3.24, Repoman-2.3.6 net-libs/grpc/Manifest | 1 + .../0001-grpc-1.11.0-Fix-cross-compiling.patch | 58 .../0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch | 38 + .../files/0003-grpc-1.3.0-Don-t-run-ldconfig.patch | 53 ++ .../0004-grpc-1.11.0-fix-cpp-so-version.patch | 49 + net-libs/grpc/grpc-1.11.0.ebuild | 64 ++ net-libs/grpc/metadata.xml | 10 7 files changed, 273 insertions(+) diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest new file mode 100644 index 000..4979a85eff1 --- /dev/null +++ b/net-libs/grpc/Manifest @@ -0,0 +1 @@ +DIST grpc-1.11.0.tar.gz 13431990 BLAKE2B d7aabd86fdaba8f8fc6fa17b411b496bbd51ef0a759d4bd77c0391e472c88f4252270ceddc19fb59a2b725d612236e1aef959f4b313551cb38204c51d1ca216b SHA512 3127cf0e66cd0712d905e6008adf6f80d787ad97eae2fba38fa3f4d343849a3dc3ca8f2ccbc82020e812fdb272e9577584c298a5b623fbdcac40c1efd7877855 diff --git a/net-libs/grpc/files/0001-grpc-1.11.0-Fix-cross-compiling.patch b/net-libs/grpc/files/0001-grpc-1.11.0-Fix-cross-compiling.patch new file mode 100644 index 000..6c4767759b4 --- /dev/null +++ b/net-libs/grpc/files/0001-grpc-1.11.0-Fix-cross-compiling.patch @@ -0,0 +1,58 @@ +From b9e631dad111f725c1a4e8b69ff1960397a5cc22 Mon Sep 17 00:00:00 2001 +From: Chirantan Ekbote+Date: Mon, 10 Jul 2017 13:19:35 -0700 +Subject: [PATCH 2/5] grpc-1.3.0: Fix cross-compiling + +Cross-compiling was severely broken in the Makefile. Fix it. + +Sent upstream as https://github.com/grpc/grpc/pull/11476. +--- + Makefile | 16 +--- + 1 file changed, 9 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 95de4f6530..4f0680e1d2 100644 +--- a/Makefile b/Makefile +@@ -329,6 +329,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) + ifeq ($(HAS_CXX11),true) +@@ -438,11 +439,12 @@ LDFLAGS += $(EXTRA_LDFLAGS) + DEFINES += $(EXTRA_DEFINES) + LDLIBS += $(EXTRA_LDLIBS) + +-HOST_CPPFLAGS = $(CPPFLAGS) +-HOST_CFLAGS = $(CFLAGS) +-HOST_CXXFLAGS = $(CXXFLAGS) +-HOST_LDFLAGS = $(LDFLAGS) +-HOST_LDLIBS = $(LDLIBS) ++HOST_CPPFLAGS = $(CPPFLAGS_NO_ARCH) -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1 -fPIC ++HOST_CFLAGS = -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI) ++HOST_CXXFLAGS = -std=c++11 ++HOST_LDFLAGS = -g -fPIC -Llibs/$(CONFIG) ++HOST_LDLIBS = -lprotoc ++HOST_AROPTS = $(AROPTS) + + # These are automatically computed variables. + # There shouldn't be any need to change anything from now on. +@@ -6838,10 +6840,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.14.0.rc0.284.gd933b75aa4-goog + diff --git a/net-libs/grpc/files/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch b/net-libs/grpc/files/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch new file mode 100644 index 000..e6bde1321a4 --- /dev/null +++ b/net-libs/grpc/files/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch @@ -0,0 +1,38 @@ +From bc139f5b7ce6a2a6d7c67480a04e029955aec0ab Mon Sep 17 00:00:00 2001 +From: Chirantan Ekbote +Date: Mon, 10 Jul 2017 13:21:27 -0700 +Subject: [PATCH 3/5] grpc-1.3.0: Fix unsecure .pc files + +The *_unsecure.pc files were still linking against the secure versions +of the grpc libraries. Fix them to link against the unsecure versions. + +Sent upstream as https://github.com/grpc/grpc/pull/11448. +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 4f0680e1d2..86bd66a5e0 100644 +--- a/Makefile b/Makefile +@@ -778,7 +778,7 @@ PC_DESCRIPTION = high performance general RPC framework without SSL + PC_CFLAGS = +