grpc: WIP update

This commit is contained in:
Alexey Pavlov
2020-04-20 22:21:44 +03:00
parent 24418c6944
commit 915dadb3bd
2 changed files with 5 additions and 23 deletions

View File

@@ -1,14 +0,0 @@
--- abseil-cpp-20190808/absl/base/config.h.orig 2020-03-31 11:46:15.671125200 +0300
+++ abseil-cpp-20190808/absl/base/config.h 2020-03-31 11:46:22.388105700 +0300
@@ -334,6 +334,11 @@
#define ABSL_HAVE_ALARM 1
#elif defined(_MSC_VER)
// feature tests for Microsoft's library
+#elif defined(__MINGW32__)
+// mingw32 doesn't provide alarm(2):
+// https://osdn.net/projects/mingw/scm/git/mingw-org-wsl/blobs/5.2-trunk/mingwrt/include/unistd.h
+// mingw-w64 provides a no-op implementation:
+// https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-crt/misc/alarm.c
#elif defined(__EMSCRIPTEN__)
// emscripten doesn't support signals
#elif defined(__native_client__)

View File

@@ -4,7 +4,7 @@ _realname=grpc
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.28.1
_abseil_ver=20190808
_abseil_ver=20200225.1
pkgrel=1
pkgdesc="gRPC - Google's high performance, open source, general RPC framework (mingw-w64)"
arch=('any')
@@ -23,13 +23,11 @@ options=('staticlibs' 'strip')
source=("${_realname}-${pkgver}.tar.gz::https://github.com/google/grpc/archive/v${pkgver}.tar.gz"
"abseil-cpp-${_abseil_ver}.tar.gz::https://github.com/abseil/abseil-cpp/archive/${_abseil_ver}.tar.gz"
001-fix-linking.patch
002-fix-verify-_WIN32_WINNT.patch
050-abseil-alarm-win32.patch)
002-fix-verify-_WIN32_WINNT.patch)
sha256sums=('4cbce7f708917b6e58b631c24c59fe720acc8fef5f959df9a58cdf9558d0a79b'
'8100085dada279bf3ee00cd064d43b5f55e5d913be0dfe2906f06f8f28d5b37e'
'0db0d26f43ba6806a8a3338da3e646bb581f0ca5359b3a201d8fb8e4752fd5f8'
'c181c8a8d1b17b4f600369ca676efb54e5268542a9f9641bce3d5669e9b465d2'
'36669a7296e4c168b0880f9bac93beeb919775c789d0675d1f5b9bd0886fb706'
'd1b363e95b929f8b7cb69dea51fc6a08f9e4200962a25140c799427f87d3972f')
'36669a7296e4c168b0880f9bac93beeb919775c789d0675d1f5b9bd0886fb706')
noextract=(${_realname}-${pkgver}.tar.gz)
prepare() {
@@ -38,9 +36,7 @@ prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
patch -p1 -i ${srcdir}/001-fix-linking.patch
patch -p1 -i ${srcdir}/002-fix-verify-_WIN32_WINNT.patch
cd ${srcdir}/abseil-cpp-${_abseil_ver}
patch -p1 -i ${srcdir}/050-abseil-alarm-win32.patch
cd ${srcdir}
rmdir ${srcdir}/${_realname}-${pkgver}/third_party/abseil-cpp