Attachment 228589 Details for Bug 259056 – v2

[patch] v2

bazel.patch (text/plain), 3.86 KB, created by Piotr Kubaj on 2021-10-11 15:39:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2021-10-11 15:39:58 UTC

Size: 3.86 KB

patch

obsolete

>diff 16c042a851131f28185f397261a0c9169f95475e /usr/ports
>blob - 4c28f2a03c49c46954aa1bec381972c93a42d51d
>file + devel/bazel/Makefile
>--- devel/bazel/Makefile
>+++ devel/bazel/Makefile
>@@ -49,6 +49,24 @@ FINALRC=	2
> EXTRA_PATCHES+=	${FILESDIR}/extra-i386_tools_cpp_BUILD.static.bsd
> .endif
> 
>+# 1. Patch abseil for powerpc*.
>+# 2. Patch WORKSPACE with a new sha256 for abseil.
>+# 3. Patch grpc with a new sha256 for abseil.
>+# 4. Patch WORKSPACE with a new sha256 for grpc.
>+#pre-patch:
>+#	@${TAR} -C /tmp/ -xzf ${WRKSRC}/derived/distdir/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz
>+#	@${PATCH} -d /tmp/abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d/ -i ${FILESDIR}/extra-patch-absl_base_internal_unscaledcycleclock.cc
>+#	@${TAR} -C /tmp -czf ${WRKSRC}/derived/distdir/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d
>+#	@${REINPLACE_CMD} -e "s|f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a|`sha256 -q ${WRKSRC}/derived/distdir/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz`|" ${WRKSRC}/WORKSPACE
>+#	@${TAR} -C /tmp/ -xzf ${WRKSRC}/derived/distdir/v1.33.1.tar.gz
>+#	@${REINPLACE_CMD} -e "s|f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a|`sha256 -q ${WRKSRC}/derived/distdir/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz`|" /tmp/grpc-1.33.1/bazel/grpc_deps.bzl
>+#	@${TAR} -C /tmp -czf ${WRKSRC}/derived/distdir/v1.33.1.tar.gz grpc-1.33.1
>+#	@${REINPLACE_CMD} -e "s|58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63|`sha256 -q ${WRKSRC}/derived/distdir/v1.33.1.tar.gz`|" ${WRKSRC}/WORKSPACE
>+
>+pre-patch:
>+	${CP} ${FILESDIR}/extra-patch-absl_base_internal_unscaledcycleclock.cc ${WRKSRC}/third_party/grpc/
>+	${CP} ${FILESDIR}/extra-patch-bazel_grpc__deps.bzl ${WRKSRC}/third_party/grpc/
>+	
> # Have the location of the system-wide rc file reside ${ETCDIR}.
> # Also adapt the sample file to disable persistent java workers as they
> # do not work reliably on FreeBSD.
>blob - /dev/null
>file + devel/bazel/files/extra-patch-absl_base_internal_unscaledcycleclock.cc
>--- /dev/null
>+++ devel/bazel/files/extra-patch-absl_base_internal_unscaledcycleclock.cc
>@@ -0,0 +1,14 @@
>+--- 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
>+ 
>blob - /dev/null
>file + devel/bazel/files/extra-patch-bazel_grpc__deps.bzl
>--- /dev/null
>+++ devel/bazel/files/extra-patch-bazel_grpc__deps.bzl
>@@ -0,0 +1,10 @@
>+--- a/bazel/grpc_deps.bzl.orig	2021-10-11 15:54:07.083144000 +0200
>++++ b/bazel/grpc_deps.bzl	2021-10-11 16:02:48.722952000 +0200
>+@@ -239,6 +239,7 @@
>+     if "com_google_absl" not in native.existing_rules():
>+         http_archive(
>+             name = "com_google_absl",
>++            patches = ["//third_party/grpc:extra-patch-absl_base_internal_unscaledcycleclock.cc"],
>+             sha256 = "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a",
>+             strip_prefix = "abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d",
>+             urls = [
>blob - /dev/null
>file + devel/bazel/files/patch-WORKSPACE
>--- /dev/null
>+++ devel/bazel/files/patch-WORKSPACE
>@@ -0,0 +1,14 @@
>+--- 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 = [

Actions: View | Diff

Attachments on bug 259056: 228573 | 228589 | 228590 | 228591