diff options
| -rw-r--r-- | etc/defaults/patch/TARGETS.absl | 3 | ||||
| -rw-r--r-- | etc/import/absl/base/TARGETS.absl | 25 | ||||
| -rw-r--r-- | etc/patches/options.h.diff | 38 | ||||
| -rw-r--r-- | etc/repos.json | 2 |
4 files changed, 67 insertions, 1 deletions
diff --git a/etc/defaults/patch/TARGETS.absl b/etc/defaults/patch/TARGETS.absl new file mode 100644 index 00000000..16a4670f --- /dev/null +++ b/etc/defaults/patch/TARGETS.absl @@ -0,0 +1,3 @@ +{ "defaults": + {"type": ["patch", "defaults"], "base": [["@", "base", "patch", "defaults"]]} +} diff --git a/etc/import/absl/base/TARGETS.absl b/etc/import/absl/base/TARGETS.absl index fcc6bc78..7383de50 100644 --- a/etc/import/absl/base/TARGETS.absl +++ b/etc/import/absl/base/TARGETS.absl @@ -118,11 +118,36 @@ , "deps": ["config", ["absl/meta", "type_traits"]] } , "config": + { "type": "export" + , "target": "config_" + , "flexible_config": + [ "ADD_CFLAGS" + , "ADD_CXXFLAGS" + , "AR" + , "ARCH" + , "CC" + , "CFLAGS" + , "CXX" + , "CXXFLAGS" + , "DEBUG" + , "ENV" + , "HOST_ARCH" + , "OS" + , "TARGET_ARCH" + , "TOOLCHAIN_CONFIG" + ] + } +, "config_": { "type": ["@", "rules", "CC", "library"] , "name": ["config"] , "stage": ["absl", "base"] , "hdrs": ["config.h", "options.h", "policy_checks.h"] } +, "options.h": + { "type": ["@", "rules", "patch", "file"] + , "src": [["FILE", null, "options.h"]] + , "patch": [["@", "patches", "", "options.h.diff"]] + } , "core_headers": { "type": "export" , "target": "core_headers_internal" diff --git a/etc/patches/options.h.diff b/etc/patches/options.h.diff new file mode 100644 index 00000000..d0f27f99 --- /dev/null +++ b/etc/patches/options.h.diff @@ -0,0 +1,38 @@ +--- options.h.orig 2023-08-21 14:27:30.600786502 +0200 ++++ options.h 2023-08-21 14:28:34.951926481 +0200 +@@ -94,7 +94,7 @@ + // User code should not inspect this macro. To check in the preprocessor if + // absl::any is a typedef of std::any, use the feature macro ABSL_USES_STD_ANY. + +-#define ABSL_OPTION_USE_STD_ANY 2 ++#define ABSL_OPTION_USE_STD_ANY 0 + + + // ABSL_OPTION_USE_STD_OPTIONAL +@@ -121,7 +121,7 @@ + // absl::optional is a typedef of std::optional, use the feature macro + // ABSL_USES_STD_OPTIONAL. + +-#define ABSL_OPTION_USE_STD_OPTIONAL 2 ++#define ABSL_OPTION_USE_STD_OPTIONAL 0 + + + // ABSL_OPTION_USE_STD_STRING_VIEW +@@ -148,7 +148,7 @@ + // absl::string_view is a typedef of std::string_view, use the feature macro + // ABSL_USES_STD_STRING_VIEW. + +-#define ABSL_OPTION_USE_STD_STRING_VIEW 2 ++#define ABSL_OPTION_USE_STD_STRING_VIEW 0 + + // ABSL_OPTION_USE_STD_VARIANT + // +@@ -174,7 +174,7 @@ + // absl::variant is a typedef of std::variant, use the feature macro + // ABSL_USES_STD_VARIANT. + +-#define ABSL_OPTION_USE_STD_VARIANT 2 ++#define ABSL_OPTION_USE_STD_VARIANT 0 + + + // ABSL_OPTION_USE_INLINE_NAMESPACE diff --git a/etc/repos.json b/etc/repos.json index a73989bb..ac368a3f 100644 --- a/etc/repos.json +++ b/etc/repos.json @@ -305,7 +305,7 @@ } , "target_root": "import targets" , "target_file_name": "TARGETS.absl" - , "bindings": {"rules": "rules-absl"} + , "bindings": {"rules": "rules-absl", "patches": "patches"} } , "zlib": { "repository": |