diff options
| author | thegeorg <[email protected]> | 2025-06-15 09:20:54 +0300 |
|---|---|---|
| committer | thegeorg <[email protected]> | 2025-06-15 09:35:43 +0300 |
| commit | b73dea5dc2b4ce1e07a5445c2cea548039cb1b3d (patch) | |
| tree | f68cef8f747bd9e62ef26a8c7dac9ee2915959c0 /contrib/libs | |
| parent | 3b415d4e63864700db99d43750e613f0f0b3bedb (diff) | |
Make contrib/libs/flatbuffers independent from abseil-cpp
commit_hash:80437ff8d8e74785109837b24c42b552e551542e
Diffstat (limited to 'contrib/libs')
| -rw-r--r-- | contrib/libs/flatbuffers/.yandex_meta/__init__.py | 3 | ||||
| -rw-r--r-- | contrib/libs/flatbuffers/include/flatbuffers/base.h | 2 | ||||
| -rw-r--r-- | contrib/libs/flatbuffers/ya.make | 4 |
3 files changed, 2 insertions, 7 deletions
diff --git a/contrib/libs/flatbuffers/.yandex_meta/__init__.py b/contrib/libs/flatbuffers/.yandex_meta/__init__.py index c96d3341e32..c3ce49728f1 100644 --- a/contrib/libs/flatbuffers/.yandex_meta/__init__.py +++ b/contrib/libs/flatbuffers/.yandex_meta/__init__.py @@ -24,7 +24,6 @@ def post_install(self): with self.yamakes["."] as m: # Remove ADDINCL GLOBAL to keep status quo. m.ADDINCL.get(self.arcdir + "/include").GLOBAL = False - m.PEERDIR.add("contrib/restricted/abseil-cpp/absl/base") flatbuffers = CMakeNinjaNixProject( @@ -44,7 +43,7 @@ flatbuffers = CMakeNinjaNixProject( "src/idl_gen_cpp_yandex_maps_iter.h", ], disable_includes=[ - "absl/strings/string_view.h", + "absl/", "experimental/string_view", "utility.h", "FLATBUFFERS_ASSERT_INCLUDE", diff --git a/contrib/libs/flatbuffers/include/flatbuffers/base.h b/contrib/libs/flatbuffers/include/flatbuffers/base.h index 99a33116e49..e71a69b8390 100644 --- a/contrib/libs/flatbuffers/include/flatbuffers/base.h +++ b/contrib/libs/flatbuffers/include/flatbuffers/base.h @@ -237,7 +237,7 @@ namespace flatbuffers { #elif __has_include("absl/strings/string_view.h") && \ __has_include("absl/base/config.h") && \ (__cplusplus >= 201411) - #include "absl/base/config.h" + #error #include "absl/base/config.h" #if !defined(ABSL_USES_STD_STRING_VIEW) #error #include "absl/strings/string_view.h" namespace flatbuffers { diff --git a/contrib/libs/flatbuffers/ya.make b/contrib/libs/flatbuffers/ya.make index 172b937f21a..d6e50c49663 100644 --- a/contrib/libs/flatbuffers/ya.make +++ b/contrib/libs/flatbuffers/ya.make @@ -10,10 +10,6 @@ VERSION(24.3.25) ORIGINAL_SOURCE(https://github.com/google/flatbuffers/archive/v24.3.25.tar.gz) -PEERDIR( - contrib/restricted/abseil-cpp/absl/base -) - ADDINCL( contrib/libs/flatbuffers/include ) |