mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
grpc: update to 1.56.0.
This commit is contained in:
parent
83ad1f22a1
commit
df10a597b1
4 changed files with 63 additions and 19 deletions
|
@ -3683,18 +3683,18 @@ liboblibs.so.0.1 oblibs-0.1.1.1_1
|
||||||
libaal-1.0.so.7 libaal-1.0.7_1
|
libaal-1.0.so.7 libaal-1.0.7_1
|
||||||
libaal-minimal.so.0 libaal-1.0.7_1
|
libaal-minimal.so.0 libaal-1.0.7_1
|
||||||
libcli.so.1.9 libcli-1.9.8.4_1
|
libcli.so.1.9 libcli-1.9.8.4_1
|
||||||
libaddress_sorting.so.27 libgrpc-1.49.1_1
|
libaddress_sorting.so.33 libgrpc-1.56.0_1
|
||||||
libgpr.so.27 libgrpc-1.49.1_1
|
libgpr.so.33 libgrpc-1.56.0_1
|
||||||
libgrpc.so.27 libgrpc-1.49.1_1
|
libgrpc.so.33 libgrpc-1.56.0_1
|
||||||
libgrpc_unsecure.so.27 libgrpc-1.49.1_1
|
libgrpc_unsecure.so.33 libgrpc-1.56.0_1
|
||||||
libupb.so.27 libgrpc-1.49.1_1
|
libupb.so.33 libgrpc-1.56.0_1
|
||||||
libgrpc++.so.1.49 libgrpc-1.49.1_1
|
libgrpc++.so.1.56 libgrpc-1.56.0_1
|
||||||
libgrpc++_alts.so.1.49 libgrpc-1.49.1_1
|
libgrpc++_alts.so.1.56 libgrpc-1.56.0_1
|
||||||
libgrpc++_error_details.so.1.49 libgrpc-1.49.1_1
|
libgrpc++_error_details.so.1.56 libgrpc-1.56.0_1
|
||||||
libgrpc++_reflection.so.1.49 libgrpc-1.49.1_1
|
libgrpc++_reflection.so.1.56 libgrpc-1.56.0_1
|
||||||
libgrpc++_unsecure.so.1.49 libgrpc-1.49.1_1
|
libgrpc++_unsecure.so.1.56 libgrpc-1.56.0_1
|
||||||
libgrpc_plugin_support.so.1.49 libgrpc-1.49.1_1
|
libgrpc_plugin_support.so.1.56 libgrpc-1.56.0_1
|
||||||
libgrpcpp_channelz.so.1.49 libgrpc-1.49.1_1
|
libgrpcpp_channelz.so.1.56 libgrpc-1.56.0_1
|
||||||
libircclient.so.1 libircclient-1.10_5
|
libircclient.so.1 libircclient-1.10_5
|
||||||
libFAudio.so.0 FAudio-19.05_1
|
libFAudio.so.0 FAudio-19.05_1
|
||||||
libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
|
libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
|
||||||
|
|
20
srcpkgs/grpc/patches/cmake.patch
Normal file
20
srcpkgs/grpc/patches/cmake.patch
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
--- a/cmake/gRPCConfig.cmake.in 2023-06-14 22:21:16.000000000 +0200
|
||||||
|
+++ - 2023-06-28 11:11:32.902678412 +0200
|
||||||
|
@@ -1,5 +1,6 @@
|
||||||
|
# Module path
|
||||||
|
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules)
|
||||||
|
+include(CMakeFindDependencyMacro)
|
||||||
|
|
||||||
|
# Depend packages
|
||||||
|
@_gRPC_FIND_ZLIB@
|
||||||
|
--- a/CMakeLists.txt 2023-07-11 08:54:22.009027477 +0200
|
||||||
|
+++ - 2023-07-11 08:54:38.950947984 +0200
|
||||||
|
@@ -12375,6 +12375,8 @@
|
||||||
|
${_gRPC_ZLIB_LIBRARIES}
|
||||||
|
${_gRPC_ALLTARGETS_LIBRARIES}
|
||||||
|
grpc_plugin_support
|
||||||
|
+ absl::hash
|
||||||
|
+ absl::raw_hash_set
|
||||||
|
)
|
||||||
|
|
||||||
|
|
23
srcpkgs/grpc/patches/revert-find-protobuf.patch
Normal file
23
srcpkgs/grpc/patches/revert-find-protobuf.patch
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
Use the old cmake provided FindProtobuf() implementation for now.
|
||||||
|
A future cmake update will remove this module, but use it for now until
|
||||||
|
all packages are updated to the new system
|
||||||
|
---
|
||||||
|
--- a/cmake/protobuf.cmake 2023-06-14 22:21:16.000000000 +0200
|
||||||
|
+++ - 2023-07-10 21:05:41.114443796 +0200
|
||||||
|
@@ -55,7 +55,7 @@
|
||||||
|
set(gRPC_INSTALL FALSE)
|
||||||
|
endif()
|
||||||
|
elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "package")
|
||||||
|
- find_package(Protobuf REQUIRED CONFIG)
|
||||||
|
+ find_package(Protobuf REQUIRED)
|
||||||
|
|
||||||
|
if(Protobuf_FOUND OR PROTOBUF_FOUND)
|
||||||
|
if(TARGET protobuf::${_gRPC_PROTOBUF_LIBRARY_NAME})
|
||||||
|
@@ -86,6 +86,6 @@
|
||||||
|
set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE ${PROTOBUF_PROTOC_EXECUTABLE})
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
- set(_gRPC_FIND_PROTOBUF "find_dependency(Protobuf CONFIG)")
|
||||||
|
+ set(_gRPC_FIND_PROTOBUF "find_dependency(Protobuf)")
|
||||||
|
endif()
|
||||||
|
endif()
|
|
@ -1,14 +1,13 @@
|
||||||
# Template file for 'grpc'
|
# Template file for 'grpc'
|
||||||
pkgname=grpc
|
pkgname=grpc
|
||||||
version=1.49.1
|
version=1.56.0
|
||||||
revision=2
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DBUILD_SHARED_LIBS=ON
|
configure_args="-DBUILD_SHARED_LIBS=ON
|
||||||
-DgRPC_CARES_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package
|
-DgRPC_CARES_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package
|
||||||
-DgRPC_SSL_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package
|
-DgRPC_SSL_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package
|
||||||
-DgRPC_ABSL_PROVIDER=package -D_gRPC_RE2_LIBRARIES=-lre2
|
-DgRPC_ABSL_PROVIDER=package -DgRPC_RE2_PROVIDER=package"
|
||||||
-D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
|
hostmakedepends="protobuf pkg-config"
|
||||||
hostmakedepends="which protobuf"
|
|
||||||
_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel abseil-cpp-devel"
|
_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel abseil-cpp-devel"
|
||||||
makedepends="libprotoc-devel protobuf-devel gperftools-devel ${_devel_depends}"
|
makedepends="libprotoc-devel protobuf-devel gperftools-devel ${_devel_depends}"
|
||||||
short_desc="High performance, open source, general RPC framework"
|
short_desc="High performance, open source, general RPC framework"
|
||||||
|
@ -16,11 +15,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
license="Apache-2.0"
|
license="Apache-2.0"
|
||||||
homepage="https://github.com/grpc/grpc"
|
homepage="https://github.com/grpc/grpc"
|
||||||
distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz"
|
distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz"
|
||||||
checksum=5071b630e2a14707ad060636990f1b25b0984bd168c7ea1ab95e48a3bdc0081f
|
checksum=e034992a0b464042021f6d440f2090acc2422c103a322b0844e3921ccea981dc
|
||||||
|
|
||||||
if [ "$CROSS_BUILD" ]; then
|
if [ "$CROSS_BUILD" ]; then
|
||||||
# need host grpc_cpp_plugin
|
# need host grpc_cpp_plugin
|
||||||
hostmakedepends+=" grpc"
|
hostmakedepends+=" grpc"
|
||||||
|
configure_args+=" -DProtobuf_PROTOC_EXECUTABLE=/usr/bin/protoc"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
|
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
|
||||||
|
@ -38,7 +38,8 @@ libgrpc_package() {
|
||||||
|
|
||||||
grpc-devel_package() {
|
grpc-devel_package() {
|
||||||
short_desc+=" - development files"
|
short_desc+=" - development files"
|
||||||
depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}"
|
depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}
|
||||||
|
protobuf-devel"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove usr/include
|
vmove usr/include
|
||||||
vmove usr/lib/*.so
|
vmove usr/lib/*.so
|
||||||
|
|
Loading…
Add table
Reference in a new issue