forge/ayaports
1
0
Fork 0
Code Issues 44 Pull requests 15 Projects Releases Packages Wiki Activity Actions

user/ruby3.0-grpc: move from backports + use ruby 3.0

Browse source
This commit is contained in:
Antoine Martin 2023-03-31 12:53:42 -04:00 committed by Antoine Martin
parent 55ec571668
commit f7186d01ca
10 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
backports/grpc/01-chttp2-maybe-uninitialized.patch → user/grpc/01-chttp2-maybe-uninitialized.patch
View file

10
backports/grpc/APKBUILD → user/grpc/APKBUILD
View file

@ -4,7 +4,7 @@
pkgname=grpc pkgname=grpc
# This version is used in gitlab-foss 15.2.2. # This version is used in gitlab-foss 15.2.2.
pkgver=1.42.0 pkgver=1.42.0
pkgrel=1 pkgrel=2
pkgdesc="The C based gRPC" pkgdesc="The C based gRPC"
url="https://grpc.io/" url="https://grpc.io/"
arch="all" arch="all"
@ -24,7 +24,7 @@ _pythondepends="
# XXX: should also depend on ruby-google-protobuf=3.18 # XXX: should also depend on ruby-google-protobuf=3.18
_rubydepends=" _rubydepends="
$pkgname=$pkgver-r$pkgrel $pkgname=$pkgver-r$pkgrel
ruby-etc ruby3.0-etc
" "
makedepends=" makedepends="
abseil-cpp abseil-cpp
@ -40,7 +40,7 @@ makedepends="
openssl-dev openssl-dev
protobuf-dev protobuf-dev
re2-dev re2-dev
ruby-dev ruby3.0-dev
samurai samurai
yaml-dev yaml-dev
xxhash-dev xxhash-dev
@ -54,7 +54,7 @@ subpackages="
$pkgname-cpp $pkgname-cpp
$pkgname-plugins $pkgname-plugins
$pkgname-doc $pkgname-doc
ruby-grpc:_ruby ruby3.0-grpc:_ruby
" "
_googletest_rev=0e402173c97aea7a00749e825b194bfede4f2e45 _googletest_rev=0e402173c97aea7a00749e825b194bfede4f2e45
source="https://github.com/grpc/grpc/archive/v$pkgver/grpc-v$pkgver.tar.gz source="https://github.com/grpc/grpc/archive/v$pkgver/grpc-v$pkgver.tar.gz
@ -67,6 +67,7 @@ source="https://github.com/grpc/grpc/archive/v$pkgver/grpc-v$pkgver.tar.gz
ruby-fix-protoc-path.patch ruby-fix-protoc-path.patch
ruby-use-system-certs.patch ruby-use-system-certs.patch
makefile-use-system-abseil.patch makefile-use-system-abseil.patch
makefile-add-wrap-memcpy-flags.patch
" "
options="!check" # sometimes hang indefinitely on builders options="!check" # sometimes hang indefinitely on builders
@ -257,4 +258,5 @@ ce7b72169b22e6e92f31b74cacf6edf6395aeb7c70fd42d7e9eaa188395b4e6e4b3acad5edfbe75c
4ea72d2acd8bee9c9022a4412aa0af0477faca7b0810d14decb3ad5d4da044247f51189512323bfee855b9b260a7f82b812310391451e5d8ee718297800d7a73 ruby-fix-protoc-path.patch 4ea72d2acd8bee9c9022a4412aa0af0477faca7b0810d14decb3ad5d4da044247f51189512323bfee855b9b260a7f82b812310391451e5d8ee718297800d7a73 ruby-fix-protoc-path.patch
631af4b9ac29c1ebabb2c88394ea2993e36cec1beda38195e1587dbd9d3c8c9eef75a17d2326d3cd2e682de551401216075ba08fdc501c098b8092d718ded381 ruby-use-system-certs.patch 631af4b9ac29c1ebabb2c88394ea2993e36cec1beda38195e1587dbd9d3c8c9eef75a17d2326d3cd2e682de551401216075ba08fdc501c098b8092d718ded381 ruby-use-system-certs.patch
3c7e8e9a6c6009278569dccdf3e79fabdb266336b894a7fe65f2a57d3cfbef72364c331ec46d9e3a05bb0deaeb841194a39d6f77d98f9e9ce609de0636f675bd makefile-use-system-abseil.patch 3c7e8e9a6c6009278569dccdf3e79fabdb266336b894a7fe65f2a57d3cfbef72364c331ec46d9e3a05bb0deaeb841194a39d6f77d98f9e9ce609de0636f675bd makefile-use-system-abseil.patch
66b709cd1fb291ab140ec87e584db13d15c308c0ea9f2ee0fa10ddb00cf33641f559235b1445137ff071dfbda9d7279bd482411fbf2f33dacbc5b14cd7f9ffa5 makefile-add-wrap-memcpy-flags.patch
" "

0
backports/grpc/fix-compiler-error.patch → user/grpc/fix-compiler-error.patch
View file

15
user/grpc/makefile-add-wrap-memcpy-flags.patch Normal file
View file

@ -0,0 +1,15 @@
diff --git a/Makefile b/Makefile
index 6c9f22d..6f21708 100644
--- a/Makefile
+++ b/Makefile
@@ -1672,7 +1672,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_
ifeq ($(SYSTEM),Darwin)
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
else
- $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.20 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
+ $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.20 -Wl,-wrap,memcpy -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(RE2_MERGE_LIBS) $(UPB_MERGE_LIBS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.20
$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so
endif

0
backports/grpc/makefile-use-system-abseil.patch → user/grpc/makefile-use-system-abseil.patch
View file

0
backports/grpc/minimal-fix-for-invalid-implicit-absl-string_view-nu.patch → user/grpc/minimal-fix-for-invalid-implicit-absl-string_view-nu.patch
View file

0
backports/grpc/ruby-dont-strip-library.patch → user/grpc/ruby-dont-strip-library.patch
View file

0
backports/grpc/ruby-fix-protoc-path.patch → user/grpc/ruby-fix-protoc-path.patch
View file

0
backports/grpc/ruby-use-shared-libs.patch → user/grpc/ruby-use-shared-libs.patch
View file

0
backports/grpc/ruby-use-system-certs.patch → user/grpc/ruby-use-system-certs.patch
View file