Attachment #228591 for bug #259056

Lines 49-54 FINALRC= 2 Link Here

(-)devel/bazel/Makefile (+5 lines)
49	EXTRA_PATCHES+= ${FILESDIR}/extra-i386_tools_cpp_BUILD.static.bsd	49	EXTRA_PATCHES+= ${FILESDIR}/extra-i386_tools_cpp_BUILD.static.bsd
50	.endif	50	.endif
51		51
		52	pre-patch:
		53	@${CP} ${FILESDIR}/extra-patch-absl_base_internal_unscaledcycleclock.cc \
		54	${FILESDIR}/extra-patch-bazel_grpc__deps.bzl \
		55	${WRKSRC}/third_party/grpc/
		56
52	# Have the location of the system-wide rc file reside ${ETCDIR}.	57	# Have the location of the system-wide rc file reside ${ETCDIR}.
53	# Also adapt the sample file to disable persistent java workers as they	58	# Also adapt the sample file to disable persistent java workers as they
54	# do not work reliably on FreeBSD.	59	# do not work reliably on FreeBSD.




--- absl/base/internal/unscaledcycleclock.cc.orig	2020-08-09 20:09:49 UTC
+++ absl/base/internal/unscaledcycleclock.cc
@@ -24,8 +24,10 @@
 #ifdef __GLIBC__
 #include <sys/platform/ppc.h>
 #elif defined(__FreeBSD__)
-#include <sys/sysctl.h>
+#include "absl/base/call_once.h"
 #include <sys/types.h>
+#include <sys/sysctl.h>
+#include <threads.h>
 #endif
 #endif
 

Added Link Here

(-)devel/bazel/files/extra-patch-bazel_grpc__deps.bzl (+10 lines)
1	--- a/bazel/grpc_deps.bzl.orig 2021-10-11 15:54:07.083144000 +0200
2	+++ b/bazel/grpc_deps.bzl 2021-10-11 16:02:48.722952000 +0200
3	@@ -239,6 +239,7 @@
4	if "com_google_absl" not in native.existing_rules():
5	http_archive(
6	name = "com_google_absl",
7	+ patches = ["//third_party/grpc:extra-patch-absl_base_internal_unscaledcycleclock.cc"],
8	sha256 = "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a",
9	strip_prefix = "abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d",
10	urls = [




--- WORKSPACE.orig	2021-10-11 09:54:26 UTC
+++ WORKSPACE
@@ -1232,7 +1232,10 @@ register_toolchains("//src/main/res:empty_rc_toolchain
 http_archive(
     name = "com_github_grpc_grpc",
     patch_args = ["-p1"],
-    patches = ["//third_party/grpc:grpc_1.33.1.patch"],
+    patches = [
+	"//third_party/grpc:grpc_1.33.1.patch",
+	"//third_party/grpc:extra-patch-bazel_grpc__deps.bzl",
+    ],
     sha256 = "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63",
     strip_prefix = "grpc-1.33.1",
     urls = [

Return to bug 259056

Added Link Here

(-)devel/bazel/files/extra-patch-absl_base_internal_unscaledcycleclock.cc (+14 lines)
1	--- absl/base/internal/unscaledcycleclock.cc.orig 2020-08-09 20:09:49 UTC
2	+++ absl/base/internal/unscaledcycleclock.cc
3	@@ -24,8 +24,10 @@
4	#ifdef __GLIBC__
5	#include <sys/platform/ppc.h>
6	#elif defined(__FreeBSD__)
7	-#include <sys/sysctl.h>
8	+#include "absl/base/call_once.h"
9	#include <sys/types.h>
10	+#include <sys/sysctl.h>
11	+#include <threads.h>
12	#endif
13	#endif
14

Added Link Here

(-)devel/bazel/files/patch-WORKSPACE (+14 lines)
1	--- WORKSPACE.orig 2021-10-11 09:54:26 UTC
2	+++ WORKSPACE
3	@@ -1232,7 +1232,10 @@ register_toolchains("//src/main/res:empty_rc_toolchain
4	http_archive(
5	name = "com_github_grpc_grpc",
6	patch_args = ["-p1"],
7	- patches = ["//third_party/grpc:grpc_1.33.1.patch"],
8	+ patches = [
9	+ "//third_party/grpc:grpc_1.33.1.patch",
10	+ "//third_party/grpc:extra-patch-bazel_grpc__deps.bzl",
11	+ ],
12	sha256 = "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63",
13	strip_prefix = "grpc-1.33.1",
14	urls = [