FreeBSD/freebsd-ports
13
78
Fork 9
Code Releases Activity

devel/bazel: properly add the abseil patch

Browse source 
In file included from external/com_google_absl/absl/base/internal/unscaledcycleclock.cc:27:
/usr/include/sys/sysctl.h:1185:25: error: unknown type name 'u_int'
int     sysctl(const int *, u_int, void *, size_t *, const void *, size_t);
                            ^
external/com_google_absl/absl/base/internal/unscaledcycleclock.cc:95:10: error: unknown type name 'once_flag'
  static once_flag init_timebase_frequency_once;
         ^
external/com_google_absl/absl/base/internal/unscaledcycleclock.cc:97:18: error: no member named 'LowLevelCallOnce' in namespace 'absl::base_internal'
  base_internal::LowLevelCallOnce(&init_timebase_frequency_once, [&]() {
  ~~~~~~~~~~~~~~~^
3 errors generated.
This commit is contained in:
Piotr Kubaj 2022-06-16 17:55:43 +02:00
parent 8223bcd120
commit 58ba468f23
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
devel/bazel/Makefile
View file

@ -56,7 +56,8 @@ BAZEL_JAVAC_OPTS+= "-J-Xmx1g -J-Xms128m"
pre-patch:
@${CP} ${FILESDIR}/extra-patch-absl_base_internal_unscaledcycleclock.cc \
${FILESDIR}/extra-patch-bazel_grpc__deps.bzl \
${WRKSRC}/third_party/py/abseil/
@${CP} ${FILESDIR}/extra-patch-bazel_grpc__deps.bzl \
${FILESDIR}/extra-patch-bazel_build_defs.bzl \
${WRKSRC}/third_party/grpc/

14
devel/bazel/files/patch-distdir_deps.bzl
View file

@ -1,10 +1,20 @@
--- distdir_deps.bzl.orig 1980-01-01 00:00:00 UTC
--- distdir_deps.bzl.orig 1979-12-31 23:00:00 UTC
+++ distdir_deps.bzl
@@ -130,6 +130,7 @@ DIST_DEPS = {
"patch_args": ["-p1"],
"patches": [
"//third_party/grpc:grpc_1.41.0.patch",
+ "//third_party/grpc:extra-patch-bazel_grpc__deps.bzl",
+ "//third_party/grpc:extra-patch-bazel_grpc__deps.bzl",
"//third_party/grpc:grpc_1.41.0.win_arm64.patch",
],
"used_in": [
@@ -168,6 +169,9 @@ DIST_DEPS = {
"https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
],
+ "patches": [
+ "//third_party/py/abseil:extra-patch-absl_base_internal_unscaledcycleclock.cc",
+ ],
"used_in": [
"additional_distfiles",
"test_WORKSPACE_files",