[abseil] Revert changes about arm build (#14109)

microsoft · Nov 4, 2020 · 75e24fa · 75e24fa
1 parent 53f9a32
commit 75e24fa
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 186 deletions.
diff --git a/ports/abseil/fix-MSVCbuildfail.patch b/ports/abseil/fix-MSVCbuildfail.patch
diff --git a/ports/abseil/fix-arm-build.patch b/ports/abseil/fix-arm-build.patch
diff --git a/ports/abseil/fix-cmake-threads-dependency.patch b/ports/abseil/fix-cmake-threads-dependency.patch
diff --git a/ports/abseil/fix-uwp-build.patch b/ports/abseil/fix-uwp-build.patch
diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake
@@ -2,25 +2,13 @@ if (NOT VCPKG_TARGET_IS_WINDOWS)
     vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 endif()
 
-set(ABSEIL_PATCHES
-    fix-uwp-build.patch
-
-    # 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
-
-    # This patch is an upstream commit: https://github.com/abseil/abseil-cpp/commit/68494aae959dfbbf781cdf03a988d2f5fc7e4802
-    fix-cmake-threads-dependency.patch
-)
-
 if("cxx17" IN_LIST FEATURES)
     # in C++17 mode, use std::any, std::optional, std::string_view, std::variant
     # instead of the library replacement types
     list(APPEND ABSEIL_PATCHES fix-use-cxx17-stdlib-types.patch)
 else()
-    # fore use of library replacement types, otherwise the automatic
+    # force use of library replacement types, otherwise the automatic
+
     # detection can cause ABI issues depending on which compiler options
     # are enabled for consuming user code
     list(APPEND ABSEIL_PATCHES fix-lnk2019-error.patch)
@@ -29,8 +17,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO abseil/abseil-cpp
-    REF 06f0e767d13d4d68071c4fc51e25724e0fc8bc74 #commit 2020-03-03
-    SHA512 f6e2302676ddae39d84d8ec92dbd13520ae214013b43455f14ced3ae6938b94cedb06cfc40eb1781dac48f02cd35ed80673ed2d871541ef4438c282a9a4133b9
+    REF 0f3bb466b868b523cf1dc9b2aaaed65c77b28862 #LTS 20200923, Patch 2
+    SHA512 17e766a2f7a655a3877eb3accc5745a910b69a5e2426b7ce7f6d31095523dd32d48a709c5f8380488b4cb93ce9faadedc08f0481dbdbd00cf68831541d724b4d
     HEAD_REF master
     PATCHES ${ABSEIL_PATCHES}
 )
@@ -70,4 +58,4 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     )
 endif()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json
@@ -1,14 +1,14 @@
 {
   "name": "abseil",
-  "version-string": "2020-03-03",
-  "port-version": 8,
+  "version-string": "2020-09-23",
   "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.",
     "In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.",
     "Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole."
   ],
   "homepage": "https://github.com/abseil/abseil-cpp",
+  "supports": "(x64 | arm64) & (linux | osx | windows)",
   "features": {
     "cxx17": {
       "description": "Enable compiler C++17."