diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-06-11 08:56:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 17:56:46 -0700 |
| commit | b0fbae8b83a0acb011dca897060f343131293708 (patch) | |
| tree | 4ace31ed29505fb9030c5efe691c903aefe4394a | |
| parent | 517116282b5db9bb2a7937cfec14f777d54d1eff (diff) | |
| download | vcpkg-b0fbae8b83a0acb011dca897060f343131293708.tar.gz vcpkg-b0fbae8b83a0acb011dca897060f343131293708.zip | |
[abseil] Enable dynamic build on Windows (#11827)
* [abseil] Enable dynamic build on Windows
* re-fix arm build
| -rw-r--r-- | ports/abseil/CONTROL | 2 | ||||
| -rw-r--r-- | ports/abseil/fix-arm-build.patch | 11 | ||||
| -rw-r--r-- | ports/abseil/portfile.cmake | 6 |
3 files changed, 15 insertions, 4 deletions
diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL index 03dda2c76..fd77769ac 100644 --- a/ports/abseil/CONTROL +++ b/ports/abseil/CONTROL @@ -1,5 +1,5 @@ Source: abseil
-Version: 2020-03-03-5
+Version: 2020-03-03-6
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 index c12b39519..bf3347ef4 100644 --- a/ports/abseil/fix-arm-build.patch +++ b/ports/abseil/fix-arm-build.patch @@ -1,7 +1,16 @@ 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 +index 98ea161..3f75d56 100644 --- a/absl/time/internal/cctz/src/zone_info_source.cc +++ b/absl/time/internal/cctz/src/zone_info_source.cc +@@ -65,7 +65,7 @@ ZoneInfoSourceFactory zone_info_source_factory __attribute__((weak)) = + extern ZoneInfoSourceFactory zone_info_source_factory; + extern ZoneInfoSourceFactory default_factory; + ZoneInfoSourceFactory default_factory = DefaultFactory; +-#if defined(_M_IX86) ++#if defined(_M_IX86) || ((defined(_M_ARM) || defined(_M_ARM64)) && defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)) + #pragma comment( \ + linker, \ + "/alternatename:?zone_info_source_factory@cctz_extension@time_internal@" ABSL_INTERNAL_MANGLED_NS \ @@ -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 \ diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index ff9a0080a..e2bedc812 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -1,4 +1,6 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+if (NOT VCPKG_TARGET_IS_WINDOWS)
+ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
set(ABSEIL_PATCHES
fix-uwp-build.patch
@@ -30,7 +32,7 @@ vcpkg_from_github( PATCHES ${ABSEIL_PATCHES}
)
-set(CMAKE_CXX_STANDARD )
+set(CMAKE_CXX_STANDARD 11)
if("cxx17" IN_LIST FEATURES)
set(CMAKE_CXX_STANDARD 17)
endif()
|