Skip to content

[vcpkg baseline][llfio] Fix arm build #23166

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

Closed
JackBoosY wants to merge 2 commits into from
Closed

[vcpkg baseline][llfio] Fix arm build #23166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a70b74f
[vcpkg baseline][llfio] Fix arm build
Feb 18, 2022
8e3d1ac
version
Feb 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/llfio/fix-arm64-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b51a873..6705915 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -208,7 +208,7 @@ function(check_cxx_source_linkage prog var)
endif()
if(CMAKE_CXX_STANDARD)
if(MSVC)
- set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} /std:c++${CMAKE_CXX_STANDARD}")
+ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} /std:c++${CMAKE_CXX_STANDARD} /MTd")
Copy link
Contributor

@ras0219-msft ras0219-msft Feb 18, 2022

Choose a reason for hiding this comment

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

While this may fix the issue, it does not seem at all like something that should be specific to llfio. We need to determine the underlying cause of this break and fix it generally instead of patching this specific library.

else()
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++${CMAKE_CXX_STANDARD}")
endif()
2 changes: 1 addition & 1 deletion ports/llfio/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ vcpkg_from_github(
# https://github.com/ned14/llfio/issues/83
# To be removed on next update
issue-83-fix-backport.patch
fix-arm64-build.patch
)

vcpkg_from_github(
Expand Down Expand Up @@ -59,7 +60,6 @@ endif()

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
-DPROJECT_IS_DEPENDENCY=On
-Dquickcpplib_DIR=${CURRENT_INSTALLED_DIR}/share/quickcpplib
Expand Down
4 changes: 4 additions & 0 deletions ports/llfio/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "llfio",
"version-string": "2.0-20220112",
"port-version": 1,
"description": "P1031 low level file i/o and filesystem library for the C++ standard",
"homepage": "https://github.com/ned14/llfio",
"supports": "!uwp",
Expand All @@ -15,6 +16,9 @@
"host": true
}
],
"default-features": [
"cxx17"
],
"features": {
"cxx17": {
"description": "Do not polyfill C++17 entities",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4170,7 +4170,7 @@
},
"llfio": {
"baseline": "2.0-20220112",
"port-version": 0
"port-version": 1
},
"llgl": {
"baseline": "2019-08-15",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/llfio.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "64983838b051699afafbaaf552472431e21f11bb",
"version-string": "2.0-20220112",
"port-version": 1
},
{
"git-tree": "aaacb49264f3175de57367f28c90bd3904d7209f",
"version-string": "2.0-20220112",
Expand Down