diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2019-12-23 15:44:37 -0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2019-12-23 15:44:37 -0800 |
| commit | 6723668f7f2eaec5a93a1e43e510358204556e8c (patch) | |
| tree | 232f3418be7035698b9d3a9852327ddd61d65223 /ports/abseil/fix-lnk2019-error.patch | |
| parent | 2ee03bab9f864cedbae44a1c8f68de5c358f7065 (diff) | |
| download | vcpkg-6723668f7f2eaec5a93a1e43e510358204556e8c.tar.gz vcpkg-6723668f7f2eaec5a93a1e43e510358204556e8c.zip | |
[abseil] Update to the latest and fix link failure error using StrCat (#9367)
* [abseil] Update to the latest and fix link failure for StrCat with > 4 arguments
* Remove message from vcpkg_fail_port_install
* Update lnk2019-error patch
Diffstat (limited to 'ports/abseil/fix-lnk2019-error.patch')
| -rw-r--r-- | ports/abseil/fix-lnk2019-error.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/ports/abseil/fix-lnk2019-error.patch b/ports/abseil/fix-lnk2019-error.patch new file mode 100644 index 000000000..f16f1f68b --- /dev/null +++ b/ports/abseil/fix-lnk2019-error.patch @@ -0,0 +1,39 @@ +diff --git a/absl/base/options.h b/absl/base/options.h
+index 3961e63..d4f21ec 100644
+--- a/absl/base/options.h
++++ b/absl/base/options.h
+@@ -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
+@@ -129,7 +129,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
+@@ -156,7 +156,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
+@@ -183,6 +183,6 @@
+ // 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
+
+ #endif // ABSL_BASE_OPTIONS_H_
|