mirror of https://github.com/microsoft/vcpkg.git
[abseil] Fix arm build (#11630)
* [abseil] Fix arm build * update baseline
This commit is contained in:
parent
10eac5e771
commit
2f28b35d77
|
|
@ -1,5 +1,5 @@
|
|||
Source: abseil
|
||||
Version: 2020-03-03-4
|
||||
Version: 2020-03-03-5
|
||||
Homepage: https://github.com/abseil/abseil-cpp
|
||||
Description: an open-source collection designed to augment the C++ standard library.
|
||||
Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/absl/time/internal/cctz/src/zone_info_source.cc b/absl/time/internal/cctz/src/zone_info_source.cc
|
||||
index 98ea161..7209533 100644
|
||||
--- a/absl/time/internal/cctz/src/zone_info_source.cc
|
||||
+++ b/absl/time/internal/cctz/src/zone_info_source.cc
|
||||
@@ -83,7 +83,8 @@ ZoneInfoSourceFactory default_factory = DefaultFactory;
|
||||
"@@U?$default_delete@VZoneInfoSource@cctz@time_internal@" ABSL_INTERNAL_MANGLED_NS \
|
||||
"@@@std@@@std@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@" ABSL_INTERNAL_MANGLED_BACKREFERENCE \
|
||||
"@@ZA")
|
||||
-#elif defined(_M_IA_64) || defined(_M_AMD64) || defined(_M_ARM64)
|
||||
+#elif defined(_M_IA_64) || defined(_M_AMD64) || defined(_M_ARM) || \
|
||||
+ defined(_M_ARM64)
|
||||
#pragma comment( \
|
||||
linker, \
|
||||
"/alternatename:?zone_info_source_factory@cctz_extension@time_internal@" ABSL_INTERNAL_MANGLED_NS \
|
||||
|
|
@ -5,6 +5,9 @@ set(ABSEIL_PATCHES
|
|||
|
||||
# This patch is an upstream commit, the related PR: https://github.com/abseil/abseil-cpp/pull/637
|
||||
fix-MSVCbuildfail.patch
|
||||
|
||||
# Remove this patch in next update, see https://github.com/google/cctz/pull/145
|
||||
fix-arm-build.patch
|
||||
)
|
||||
|
||||
if("cxx17" IN_LIST FEATURES)
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@
|
|||
7zip:x64-linux=fail
|
||||
7zip:x64-osx=fail
|
||||
7zip:x64-uwp=fail
|
||||
abseil:arm-uwp=fail
|
||||
activemq-cpp:x64-windows-static=fail
|
||||
activemq-cpp:x64-linux=fail
|
||||
activemq-cpp:x64-osx=fail
|
||||
|
|
@ -569,7 +568,6 @@ graphite2:arm-uwp=fail
|
|||
graphite2:x64-uwp=fail
|
||||
graphqlparser:arm-uwp=fail
|
||||
graphqlparser:x64-uwp=fail
|
||||
grpc:arm-uwp=fail
|
||||
gsl:arm-uwp=fail
|
||||
gsl:x64-uwp=fail
|
||||
# https://github.com/microsoft/vcpkg/pull/11048
|
||||
|
|
|
|||
Loading…
Reference in New Issue