commit d528a95f04d299c799d9dbbc2f77ace3f392f4fb
Author: Jakub Bogusz <[email protected]>
Date: Sat Sep 26 23:13:15 2020 +0200
- updated to 1.32.0
- updated system-absl patch
- added system-re2 patch, use system re2 library
grpc-system-absl.patch | 17 +++++++++++++++++
grpc-system-re2.patch | 31 +++++++++++++++++++++++++++++++
grpc.spec | 21 ++++++++++++++-------
3 files changed, 62 insertions(+), 7 deletions(-)
---
diff --git a/grpc.spec b/grpc.spec
index b7c32af..b8be097 100644
--- a/grpc.spec
+++ b/grpc.spec
@@ -10,17 +10,18 @@
Summary: RPC library and framework
Summary(pl.UTF-8): Biblioteka i szkielet RPC
Name: grpc
-Version: 1.30.0
+Version: 1.32.0
Release: 1
License: Apache v2.0
Group: Libraries
#Source0Download: https://github.com/grpc/grpc/releases
Source0:
https://github.com/grpc/grpc/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 316b30c89b48b8ae0ad005bb12ac566a
+# Source0-md5: e2afa783e763d5f6bc09b664b907ff25
Patch0: %{name}-system-absl.patch
Patch1: %{name}-sphinx.patch
Patch2: %{name}-x32.patch
Patch3: %{name}-libdir.patch
+Patch4: %{name}-system-re2.patch
URL: https://grpc.io/
BuildRequires: abseil-cpp-devel
BuildRequires: c-ares-devel >= 1.13.0
@@ -140,6 +141,7 @@ Dokumentacja API biblioteki Pythona gRPC.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
install -d build
@@ -150,6 +152,7 @@ cd build
-DgRPC_ABSL_PROVIDER=package \
-DgRPC_CARES_PROVIDER=package \
-DgRPC_PROTOBUF_PROVIDER=package \
+ -DgRPC_RE2_PROVIDER=package \
-DgRPC_SSL_PROVIDER=package \
-DgRPC_ZLIB_PROVIDER=package
@@ -159,6 +162,7 @@ cd ..
export GRPC_PYTHON_BUILD_SYSTEM_ABSL=1
export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+export GRPC_PYTHON_BUILD_SYSTEM_RE2=1
export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
%if %{with python2}
@@ -185,6 +189,7 @@ rm -rf $RPM_BUILD_ROOT
export GRPC_PYTHON_BUILD_SYSTEM_ABSL=1
export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+export GRPC_PYTHON_BUILD_SYSTEM_RE2=1
export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
%if %{with python2}
@@ -218,13 +223,13 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/grpc_python_plugin
%attr(755,root,root) %{_bindir}/grpc_ruby_plugin
%attr(755,root,root) %{_libdir}/libgpr.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgpr.so.10
+%attr(755,root,root) %ghost %{_libdir}/libgpr.so.12
%attr(755,root,root) %{_libdir}/libgrpc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgrpc.so.10
+%attr(755,root,root) %ghost %{_libdir}/libgrpc.so.12
%attr(755,root,root) %{_libdir}/libgrpc_plugin_support.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libgrpc_plugin_support.so.1
%attr(755,root,root) %{_libdir}/libgrpc_unsecure.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgrpc_unsecure.so.10
+%attr(755,root,root) %ghost %{_libdir}/libgrpc_unsecure.so.12
%attr(755,root,root) %{_libdir}/libgrpc++.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libgrpc++.so.1
%attr(755,root,root) %{_libdir}/libgrpc++_alts.so.*.*.*
@@ -239,9 +244,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %ghost %{_libdir}/libgrpcpp_channelz.so.1
# TODO: use system libs instead
%attr(755,root,root) %{_libdir}/libaddress_sorting.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libaddress_sorting.so.10
+%attr(755,root,root) %ghost %{_libdir}/libaddress_sorting.so.12
%attr(755,root,root) %{_libdir}/libupb.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libupb.so.10
+%attr(755,root,root) %ghost %{_libdir}/libupb.so.12
%{_datadir}/grpc
%files devel
@@ -282,6 +287,7 @@ rm -rf $RPM_BUILD_ROOT
%{py_sitedir}/grpc/_cython/__init__.py[co]
%{py_sitedir}/grpc/_cython/_credentials
%{py_sitedir}/grpc/_cython/_cygrpc
+%{py_sitedir}/grpc/aio
%{py_sitedir}/grpc/beta
%{py_sitedir}/grpc/experimental
%{py_sitedir}/grpc/framework
@@ -300,6 +306,7 @@ rm -rf $RPM_BUILD_ROOT
%{py3_sitedir}/grpc/_cython/__pycache__
%{py3_sitedir}/grpc/_cython/_credentials
%{py3_sitedir}/grpc/_cython/_cygrpc
+%{py3_sitedir}/grpc/aio
%{py3_sitedir}/grpc/beta
%{py3_sitedir}/grpc/experimental
%{py3_sitedir}/grpc/framework
diff --git a/grpc-system-absl.patch b/grpc-system-absl.patch
index a943892..f1e34db 100644
--- a/grpc-system-absl.patch
+++ b/grpc-system-absl.patch
@@ -20,3 +20,20 @@
EXTENSION_INCLUDE_DIRECTORIES = ((PYTHON_STEM,) + CORE_INCLUDE + ABSL_INCLUDE
+
ADDRESS_SORTING_INCLUDE + CARES_INCLUDE +
SSL_INCLUDE + UPB_INCLUDE +
+@@ -285,6 +285,16 @@
+ EXTENSION_LIBRARIES += ('z',)
+ if BUILD_WITH_SYSTEM_CARES:
+ EXTENSION_LIBRARIES += ('cares',)
++if BUILD_WITH_SYSTEM_ABSL:
++ EXTENSION_LIBRARIES += ('absl_base', 'absl_exponential_biased',
'absl_malloc_internal',
++ 'absl_raw_logging_internal',
'absl_spinlock_wait', 'absl_throw_delegate',
++ 'absl_log_severity', 'absl_hashtablez_sampler',
'absl_raw_hash_set',
++ 'absl_debugging_internal',
'absl_demangle_internal', 'absl_stacktrace',
++ 'absl_symbolize', 'absl_city', 'absl_hash',
'absl_int128', 'absl_status',
++ 'absl_strings', 'absl_cord',
'absl_strings_internal',
++ 'absl_str_format_internal',
'absl_synchronization', 'absl_time',
++ 'absl_civil_time', 'absl_time_zone',
'absl_bad_optional_access',
++ 'absl_bad_variant_access')
+
+ DEFINE_MACROS = (('_WIN32_WINNT', 0x600),)
+ asm_files = []
diff --git a/grpc-system-re2.patch b/grpc-system-re2.patch
new file mode 100644
index 0000000..38fdb47
--- /dev/null
+++ b/grpc-system-re2.patch
@@ -0,0 +1,31 @@
+--- grpc-1.32.0/setup.py.orig 2020-09-26 16:22:20.927767970 +0200
++++ grpc-1.32.0/setup.py 2020-09-26 16:42:32.857869048 +0200
+@@ -134,6 +134,8 @@
+
+ BUILD_WITH_SYSTEM_ABSL = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_ABSL',
False)
+
++BUILD_WITH_SYSTEM_RE2 = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_RE2', False)
++
+ # For local development use only: This skips building gRPC Core and its
+ # dependencies, including protobuf and boringssl. This allows "incremental"
+ # compilation by first building gRPC Core using make, then building only the
+@@ -252,6 +254,10 @@
+ CORE_C_FILES = filter(lambda x: 'third_party/abseil-cpp' not in x,
CORE_C_FILES)
+ ABSL_INCLUDE = (os.path.join('/usr', 'include'),)
+
++if BUILD_WITH_SYSTEM_RE2:
++ CORE_C_FILES = filter(lambda x: 'third_party/re2' not in x, CORE_C_FILES)
++ RE2_INCLUDE = (os.path.join('/usr', 'include'),)
++
+ EXTENSION_INCLUDE_DIRECTORIES = ((PYTHON_STEM,) + CORE_INCLUDE + ABSL_INCLUDE
+
+ ADDRESS_SORTING_INCLUDE + CARES_INCLUDE +
+ RE2_INCLUDE + SSL_INCLUDE + UPB_INCLUDE +
+@@ -295,6 +295,8 @@
+ 'absl_str_format_internal',
'absl_synchronization', 'absl_time',
+ 'absl_civil_time', 'absl_time_zone',
'absl_bad_optional_access',
+ 'absl_bad_variant_access')
++if BUILD_WITH_SYSTEM_RE2:
++ EXTENSION_LIBRARIES += ('re2',)
+
+ DEFINE_MACROS = (('_WIN32_WINNT', 0x600),)
+ asm_files = []
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/grpc.git/commitdiff/d528a95f04d299c799d9dbbc2f77ace3f392f4fb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
