Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haikuports/haikuports
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c4b2943a24f0
Choose a base ref
...
head repository: haikuports/haikuports
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e22eecef8bb4
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 18, 2021

  1. grpc: switch to c++17 

    __thread works better as thread_local for our gcc
    @korli
    korli committed Oct 18, 2021
    Copy the full SHA
    e22eece View commit details
Showing with 16 additions and 2 deletions.
  1. +2 −1 net-libs/grpc/grpc-1.41.0.recipe
  2. +14 −1 net-libs/grpc/patches/grpc-1.41.0.patchset
3 changes: 2 additions & 1 deletion net-libs/grpc/grpc-1.41.0.recipe
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ connected systems."
HOMEPAGE="https://grpc.io/"
COPYRIGHT="2015-2021 The gRPC Authors"
LICENSE="Apache v2"
REVISION="2"
REVISION="3"
SOURCE_URI="https://github.com/grpc/grpc/archive/v$portVersion/grpc-$portVersion.tar.gz"
CHECKSUM_SHA256="e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656"
PATCHES="grpc-$portVersion.patchset"
@@ -103,6 +103,7 @@ BUILD()
cmake -Bbuild -S . \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$prefix \
-DCMAKE_CXX_STANDARD=17 \
-DBUILD_SHARED_LIBS=ON \
-DgRPC_INSTALL_BINDIR=$relativeBinDir \
-DgRPC_INSTALL_INCLUDEDIR=$relativeIncludeDir \
15 changes: 14 additions & 1 deletion net-libs/grpc/patches/grpc-1.41.0.patchset
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 43dcbea98e45c60994137c0dc8b5538dca92cab3 Mon Sep 17 00:00:00 2001
From 38c91c597e37f36c9a36bf9894f3bfaae2db9ea4 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
@@ -73,6 +73,19 @@ index 8b9831b..d4dad67 100644
#else
#error "Could not auto-detect platform"
#endif
diff --git a/src/core/lib/gpr/tls.h b/src/core/lib/gpr/tls.h
index 32add50..63c2616 100644
--- a/src/core/lib/gpr/tls.h
+++ b/src/core/lib/gpr/tls.h
@@ -144,7 +144,7 @@ class PthreadTlsImpl : TlsTypeConstrainer<T> {
#else

#define GPR_THREAD_LOCAL(type) \
- thread_local typename grpc_core::TlsTypeConstrainer<type>::Type
+ __thread typename grpc_core::TlsTypeConstrainer<type>::Type

#endif

diff --git a/src/core/lib/iomgr/port.h b/src/core/lib/iomgr/port.h
index 3e32429..28e9b11 100644
--- a/src/core/lib/iomgr/port.h