cemu-project/vcpkg
1
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-18 18:49:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[abseil] Enable dynamic build on Windows (#11827)

Browse Source 
* [abseil] Enable dynamic build on Windows

* re-fix arm build
This commit is contained in:
Jack·Boos·Yu 2020-06-11 08:56:46 +08:00 committed by GitHub
parent 517116282b
commit b0fbae8b83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/abseil/CONTROL
View File

@ -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.

11
ports/abseil/fix-arm-build.patch
View File

@ -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 \

6
ports/abseil/portfile.cmake
View File

@ -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()