mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
grpc: bump version
This commit is contained in:
Jerome Duval
@@ -8,9 +8,9 @@ COPYRIGHT="2015-2022 The gRPC Authors"
|
||||
LICENSE="Apache v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/grpc/grpc/archive/refs/tags/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="b74ce7d26fe187970d1d8e2c06a5d3391122f7bc1fdce569aff5e435fb8fe780"
|
||||
CHECKSUM_SHA256="64b791c3dad387230f8b46cbd0c474b6ae751f7f805d05cb3bae36ac0ff2a7e7"
|
||||
SOURCE_FILENAME="grpc-$portVersion.tar.gz"
|
||||
gtestCommit="c9ccac7cb7345901884aabf5d1a786cfa6e2f397"
|
||||
gtestCommit="0e402173c97aea7a00749e825b194bfede4f2e45"
|
||||
SOURCE_URI_2="https://github.com/google/googletest/archive/$gtestCommit/googletest-$gtestCommit.tar.gz"
|
||||
CHECKSUM_SHA256_2="443d383db648ebb8e391382c0ab63263b7091d03197f304390baac10f178a468"
|
||||
SOURCE_DIR_2="googletest-$gtestCommit"
|
||||
@@ -21,7 +21,7 @@ SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
libVersion="21.0.0"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
libCppVersion="1.43.2"
|
||||
libCppVersion="1.46.2"
|
||||
libCppVersionCompat="$libCppVersion compat >= ${libCppVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
@@ -86,14 +86,14 @@ REQUIRES_devel="
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libabsl_cord$secondaryArchSuffix
|
||||
devel:libabsl_status$secondaryArchSuffix
|
||||
devel:libabsl_strings$secondaryArchSuffix
|
||||
devel:libabsl_synchronization$secondaryArchSuffix
|
||||
devel:libabsl_time$secondaryArchSuffix
|
||||
devel:libabsl_cord$secondaryArchSuffix >= 2111.0.0
|
||||
devel:libabsl_status$secondaryArchSuffix >= 2111.0.0
|
||||
devel:libabsl_strings$secondaryArchSuffix >= 2111.0.0
|
||||
devel:libabsl_synchronization$secondaryArchSuffix >= 2111.0.0
|
||||
devel:libabsl_time$secondaryArchSuffix >= 2111.0.0
|
||||
devel:libbenchmark$secondaryArchSuffix
|
||||
devel:libcares$secondaryArchSuffix
|
||||
devel:libprotobuf$secondaryArchSuffix >= 28
|
||||
devel:libprotobuf$secondaryArchSuffix >= 31
|
||||
devel:libre2$secondaryArchSuffix
|
||||
devel:libssl$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
@@ -113,7 +113,8 @@ TEST_REQUIRES="
|
||||
|
||||
BUILD()
|
||||
{
|
||||
ln -sf $sourceDir2/googlemock $sourceDir2/googletest \
|
||||
mkdir -p third_party/googletest
|
||||
ln -srf $sourceDir2/googlemock $sourceDir2/googletest \
|
||||
third_party/googletest
|
||||
cmake -Bbuild -S . \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
@@ -1,22 +1,22 @@
|
||||
From 9be8fe9ed49e79f1c10dd389d6209b290e2efb40 Mon Sep 17 00:00:00 2001
|
||||
From bedffa769cda6c4da7e739117a8b0546320e0f11 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Sat, 16 Oct 2021 21:33:26 +0200
|
||||
Subject: Haiku: port
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8248866..4a8a692 100644
|
||||
index 5291379..69963d3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -269,7 +269,7 @@ if(_gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_IOS)
|
||||
set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m pthread)
|
||||
elseif(_gRPC_PLATFORM_ANDROID)
|
||||
set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m)
|
||||
-elseif(UNIX)
|
||||
+elseif(UNIX AND NOT HAIKU)
|
||||
set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} rt m pthread)
|
||||
@@ -295,7 +295,7 @@ if (gRPC_XDS_USER_AGENT_IS_CSHARP)
|
||||
add_definitions("-DGRPC_XDS_USER_AGENT_NAME_SUFFIX=\"csharp\"" "-DGRPC_XDS_USER_AGENT_VERSION_SUFFIX=\"2.46.2\"")
|
||||
endif()
|
||||
|
||||
-if(UNIX)
|
||||
+if(UNIX AND NOT HAIKU)
|
||||
# -pthread does more than -lpthread
|
||||
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
||||
find_package(Threads)
|
||||
diff --git a/include/grpc/event_engine/port.h b/include/grpc/event_engine/port.h
|
||||
index 9424586..5ee5327 100644
|
||||
--- a/include/grpc/event_engine/port.h
|
||||
@@ -31,10 +31,10 @@ index 9424586..5ee5327 100644
|
||||
#include <arpa/inet.h>
|
||||
#include <netdb.h>
|
||||
diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h
|
||||
index d9fdeed..145b60b 100644
|
||||
index 3227f51..4e2a225 100644
|
||||
--- a/include/grpc/impl/codegen/port_platform.h
|
||||
+++ b/include/grpc/impl/codegen/port_platform.h
|
||||
@@ -400,6 +400,30 @@
|
||||
@@ -404,6 +404,30 @@
|
||||
#define GPR_HAS_PTHREAD_H 1
|
||||
#define GPR_GETPID_IN_UNISTD_H 1
|
||||
#define GRPC_ROOT_PEM_PATH "/config/ssl/cert.pem"
|
||||
@@ -66,10 +66,10 @@ index d9fdeed..145b60b 100644
|
||||
#error "Could not auto-detect platform"
|
||||
#endif
|
||||
diff --git a/src/core/lib/gpr/tls.h b/src/core/lib/gpr/tls.h
|
||||
index 5c9b69e..d989134 100644
|
||||
index 7ea6598..692180c 100644
|
||||
--- a/src/core/lib/gpr/tls.h
|
||||
+++ b/src/core/lib/gpr/tls.h
|
||||
@@ -144,7 +144,7 @@ class PthreadTlsImpl : TlsTypeConstrainer<T> {
|
||||
@@ -151,7 +151,7 @@ class PthreadTlsImpl : TlsTypeConstrainer<T> {
|
||||
#else
|
||||
|
||||
#define GPR_THREAD_LOCAL(type) \
|
||||
@@ -79,10 +79,10 @@ index 5c9b69e..d989134 100644
|
||||
#endif
|
||||
|
||||
diff --git a/src/core/lib/iomgr/port.h b/src/core/lib/iomgr/port.h
|
||||
index 3e32429..28e9b11 100644
|
||||
index 8762791..82eb34e 100644
|
||||
--- a/src/core/lib/iomgr/port.h
|
||||
+++ b/src/core/lib/iomgr/port.h
|
||||
@@ -180,6 +180,16 @@
|
||||
@@ -177,6 +177,16 @@
|
||||
// TODO(rudominer) Check this does something we want.
|
||||
#define GRPC_POSIX_SOCKETUTILS 1
|
||||
#define GRPC_TIMER_USE_GENERIC 1
|
||||
@@ -103,14 +103,14 @@ index 3e32429..28e9b11 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From f00bad0d226184c3360be70b3894140786c98427 Mon Sep 17 00:00:00 2001
|
||||
From 590791b8346bdf078b3f2686e13060e41bbc7625 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Fri, 22 Oct 2021 14:54:43 +0200
|
||||
Subject: patch needed to help build and run tests on Haiku
|
||||
|
||||
|
||||
diff --git a/tools/run_tests/python_utils/jobset.py b/tools/run_tests/python_utils/jobset.py
|
||||
index 48503d3..500aafe 100755
|
||||
index 2174c00..99dd74e 100755
|
||||
--- a/tools/run_tests/python_utils/jobset.py
|
||||
+++ b/tools/run_tests/python_utils/jobset.py
|
||||
@@ -58,6 +58,8 @@ def platform_string():
|
||||
@@ -123,10 +123,10 @@ index 48503d3..500aafe 100755
|
||||
return 'posix'
|
||||
|
||||
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
|
||||
index 9fa3b4b..5ea7fa0 100755
|
||||
index bf1b8d0..9fce0d4 100755
|
||||
--- a/tools/run_tests/run_tests.py
|
||||
+++ b/tools/run_tests/run_tests.py
|
||||
@@ -273,6 +273,19 @@ class CLanguage(object):
|
||||
@@ -303,6 +303,19 @@ class CLanguage(object):
|
||||
# see https://github.com/grpc/grpc/blob/b5b8578b3f8b4a9ce61ed6677e19d546e43c5c68/tools/run_tests/artifacts/artifact_targets.py#L253
|
||||
self._cmake_configure_extra_args.append('-DOPENSSL_NO_ASM=ON')
|
||||
|
||||
@@ -150,7 +150,7 @@ index 9fa3b4b..5ea7fa0 100755
|
||||
2.30.2
|
||||
|
||||
|
||||
From 11c8a037deda0da7031e015cf338180da21213d3 Mon Sep 17 00:00:00 2001
|
||||
From 7dc62c4b29b7d4b40b22b0dd42703c825e206d69 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Fri, 26 Nov 2021 20:17:18 +0100
|
||||
Subject: protobuf minimum version 1.16.0
|
||||
Reference in New Issue
Block a user