Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[abseil] Revert changes about arm build #14109

Merged
merged 10 commits into from
Nov 4, 2020
Merged

[abseil] Revert changes about arm build #14109

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
76591f9
[abseil] Re-fix arm/uwp build
Oct 19, 2020
dc9f13c
[abseil] Update to LTS 20200923, Patch 2
Oct 23, 2020
e1b0378
[abseil] Remove arm patch since it should be fixed in the upstream
Oct 27, 2020
7549b9d
Add supports
Oct 28, 2020
6d4d184
Update ports/abseil/vcpkg.json
JackBoosY Nov 3, 2020
a5a96ef
Update ports/abseil/vcpkg.json
JackBoosY Nov 3, 2020
162a1ec
Update ports/abseil/vcpkg.json
JackBoosY Nov 4, 2020
c670f26
Update ports/abseil/vcpkg.json
JackBoosY Nov 4, 2020
38869fa
Update ports/abseil/vcpkg.json
JackBoosY Nov 4, 2020
cd0e851
Update ports/abseil/portfile.cmake
JackBoosY Nov 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
65 changes: 0 additions & 65 deletions ports/abseil/fix-MSVCbuildfail.patch
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions ports/abseil/fix-arm-build.patch
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions ports/abseil/fix-cmake-threads-dependency.patch
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions ports/abseil/fix-uwp-build.patch
View file
Open in desktop

This file was deleted.

19 changes: 3 additions & 16 deletions ports/abseil/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,12 @@ 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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There may still be problems with this official patch. I have opened an issue (google/cctz#173) upstream to discuss this changes.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Considering they don't support x86 either it seems unlikely to me that they will care about supporting arm

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
# fore use of library replacement types, otherwise the automaticc
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
# detection can cause ABI issues depending on which compiler options
# are enabled for consuming user code
list(APPEND ABSEIL_PATCHES fix-lnk2019-error.patch)
Expand All @@ -29,8 +16,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}
)
Expand Down
4 changes: 2 additions & 2 deletions ports/abseil/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": "linux | osx | ((x64 | (arm & !arm64)) & windows)",
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
"features": {
"cxx17": {
"description": "Enable compiler C++17."
Expand Down