-
Notifications
You must be signed in to change notification settings - Fork 53
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Applying local patch to workaround abseil/abseil-cpp/issues/1769 (#60)
Until abseil integrates this fix upstream, grpc picks up the new version of abseil with the fix, and until triton upgrades the grpc dependency, this will alleviate the repeated build issues in the meantime.
- Loading branch information
1 parent
3d456e0
commit 28f0ad9
Showing
3 changed files
with
32 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
--- CMakeLists.txt 2024-10-11 14:53:24.305084638 -0700 | ||
+++ CMakeLists.txt 2024-10-11 14:53:35.288981516 -0700 | ||
@@ -214,6 +214,7 @@ | ||
PATTERN "*.h" | ||
PATTERN "copts" EXCLUDE | ||
PATTERN "testdata" EXCLUDE | ||
+ PATTERN "options.h" EXCLUDE | ||
) | ||
|
||
file(READ "absl/base/options.h" ABSL_INTERNAL_OPTIONS_H_CONTENTS) | ||
@@ -230,7 +231,17 @@ | ||
ABSL_INTERNAL_OPTIONS_H_PINNED | ||
"${ABSL_INTERNAL_OPTIONS_H_CONTENTS}") | ||
endif() | ||
- file(WRITE "${CMAKE_BINARY_DIR}/options-pinned.h" "${ABSL_INTERNAL_OPTIONS_H_PINNED}") | ||
+ set(ABSL_INTERNAL_OPTIONS_H_PINNED_GENERATE TRUE) | ||
+ if (EXISTS "${CMAKE_BINARY_DIR}/options-pinned.h") | ||
+ file(READ "${CMAKE_BINARY_DIR}/options-pinned.h" ABSL_INTERNAL_OPTIONS_PINNED_H_CONTENTS) | ||
+ if ("${ABSL_INTERNAL_OPTIONS_H_PINNED}" STREQUAL "${ABSL_INTERNAL_OPTIONS_PINNED_H_CONTENTS}") | ||
+ set(ABSL_INTERNAL_OPTIONS_H_PINNED_GENERATE FALSE) | ||
+ endif() | ||
+ endif() | ||
+ | ||
+ if (ABSL_INTERNAL_OPTIONS_H_PINNED_GENERATE) | ||
+ file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/options-pinned.h" CONTENT "${ABSL_INTERNAL_OPTIONS_H_PINNED}") | ||
+ endif() | ||
|
||
install(FILES "${CMAKE_BINARY_DIR}/options-pinned.h" | ||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/absl/base |
This file was deleted.
Oops, something went wrong.