mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
54 lines
1.6 KiB
Plaintext
54 lines
1.6 KiB
Plaintext
From 26abb7c684801b3cda7212d9d2570333ea96971e Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Mon, 18 Oct 2021 11:19:05 +0200
|
|
Subject: protobuf search path
|
|
|
|
|
|
diff --git a/source/intercept/proto/CMakeLists.txt b/source/intercept/proto/CMakeLists.txt
|
|
index e4fb8c1..8bbd58c 100644
|
|
--- a/source/intercept/proto/CMakeLists.txt
|
|
+++ b/source/intercept/proto/CMakeLists.txt
|
|
@@ -11,6 +11,7 @@ add_custom_command(
|
|
${_PROTOBUF_PROTOC}
|
|
ARGS
|
|
-I "${SUPERVISE_PROTO_PATH}"
|
|
+ -I "/system/develop/headers"
|
|
--grpc_out "${CMAKE_CURRENT_BINARY_DIR}"
|
|
--cpp_out "${CMAKE_CURRENT_BINARY_DIR}"
|
|
--plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}"
|
|
@@ -34,6 +35,7 @@ add_custom_command(
|
|
${_PROTOBUF_PROTOC}
|
|
ARGS
|
|
-I "${SUPERVISE_PROTO_PATH}"
|
|
+ -I "/system/develop/headers"
|
|
--grpc_out "${CMAKE_CURRENT_BINARY_DIR}"
|
|
--cpp_out "${CMAKE_CURRENT_BINARY_DIR}"
|
|
--plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}"
|
|
--
|
|
2.45.2
|
|
|
|
|
|
From db77e4b93a1923ca30d05da8a67ac944d9e24fdb Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Mon, 18 Oct 2021 15:22:06 +0200
|
|
Subject: workaround gtest with Haiku error definition
|
|
|
|
|
|
diff --git a/source/libsys/test/ErrorsTest.cc b/source/libsys/test/ErrorsTest.cc
|
|
index caea6bd..7b870ca 100644
|
|
--- a/source/libsys/test/ErrorsTest.cc
|
|
+++ b/source/libsys/test/ErrorsTest.cc
|
|
@@ -23,6 +23,9 @@
|
|
|
|
#include <cerrno>
|
|
|
|
+#undef ENOENT
|
|
+#define ENOENT 0x80006003
|
|
+
|
|
namespace {
|
|
|
|
TEST(errors, ENOENT)
|
|
--
|
|
2.45.2
|
|
|