From a495de45b15c6ddecd82da62b5fa5ab6794de10f Mon Sep 17 00:00:00 2001 From: Carson Storm Date: Mon, 20 Feb 2023 16:01:42 -0700 Subject: [PATCH 1/3] fix missing StatusOr on Mac build --- actions/action/BUILD | 1 + actions/action/keystroke.h | 1 + 2 files changed, 2 insertions(+) diff --git a/actions/action/BUILD b/actions/action/BUILD index 06f4558..88bd351 100644 --- a/actions/action/BUILD +++ b/actions/action/BUILD @@ -7,6 +7,7 @@ cc_library( deps = [ "@com_google_absl//absl/types:variant", "@com_google_absl//absl/status", + "@com_google_absl//absl/status:statusor", ] + select({ "@platforms//os:linux": ["//actions/internal/linux:keystroke"], "//conditions:default": [], diff --git a/actions/action/keystroke.h b/actions/action/keystroke.h index 7ffd019..beaea7c 100644 --- a/actions/action/keystroke.h +++ b/actions/action/keystroke.h @@ -5,6 +5,7 @@ #include #include "absl/status/status.h" +#include "absl/status/statusor.h" #if defined(__linux__) #include "actions/internal/linux/keystroke.h" From 50cf0c25052c39f9e6a14eecaa25cc84c4898aca Mon Sep 17 00:00:00 2001 From: Carson Storm Date: Mon, 20 Feb 2023 16:19:37 -0700 Subject: [PATCH 2/3] add target platform contstraints --- third_party/X11.BUILD | 1 + third_party/xcb.BUILD | 1 + 2 files changed, 2 insertions(+) diff --git a/third_party/X11.BUILD b/third_party/X11.BUILD index b4366d2..7dfccc2 100644 --- a/third_party/X11.BUILD +++ b/third_party/X11.BUILD @@ -10,5 +10,6 @@ cc_library( linkopts = [ "-l:libX11.so", ], + target_compatible_with = ["@platforms//os:linux"], visibility = ["//visibility:public"], ) diff --git a/third_party/xcb.BUILD b/third_party/xcb.BUILD index e85dfbb..9522f83 100644 --- a/third_party/xcb.BUILD +++ b/third_party/xcb.BUILD @@ -13,5 +13,6 @@ cc_library( "-l:libxcb-xtest.so", "-l:libxcb.so", ], + target_compatible_with = ["@platforms//os:linux"], visibility = ["//visibility:public"], ) From 3db75338dd245712fc775f014e65da21ebe444ea Mon Sep 17 00:00:00 2001 From: Carson Storm Date: Mon, 20 Feb 2023 16:26:29 -0700 Subject: [PATCH 3/3] undo --- third_party/X11.BUILD | 1 - third_party/xcb.BUILD | 1 - 2 files changed, 2 deletions(-) diff --git a/third_party/X11.BUILD b/third_party/X11.BUILD index 7dfccc2..b4366d2 100644 --- a/third_party/X11.BUILD +++ b/third_party/X11.BUILD @@ -10,6 +10,5 @@ cc_library( linkopts = [ "-l:libX11.so", ], - target_compatible_with = ["@platforms//os:linux"], visibility = ["//visibility:public"], ) diff --git a/third_party/xcb.BUILD b/third_party/xcb.BUILD index 9522f83..e85dfbb 100644 --- a/third_party/xcb.BUILD +++ b/third_party/xcb.BUILD @@ -13,6 +13,5 @@ cc_library( "-l:libxcb-xtest.so", "-l:libxcb.so", ], - target_compatible_with = ["@platforms//os:linux"], visibility = ["//visibility:public"], )