diff options
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/abseil/CONTROL | 2 | ||||
| -rw-r--r-- | ports/abseil/fix-arm-build.patch | 14 | ||||
| -rw-r--r-- | ports/abseil/portfile.cmake | 3 |
3 files changed, 18 insertions, 1 deletions
diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL index 5822ef2ce..03dda2c76 100644 --- a/ports/abseil/CONTROL +++ b/ports/abseil/CONTROL @@ -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.
diff --git a/ports/abseil/fix-arm-build.patch b/ports/abseil/fix-arm-build.patch new file mode 100644 index 000000000..c12b39519 --- /dev/null +++ b/ports/abseil/fix-arm-build.patch @@ -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 \ diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index a82b72b9f..ff9a0080a 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -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)
|