diff --git a/ports/llfio/fix-arm64-build.patch b/ports/llfio/fix-arm64-build.patch new file mode 100644 index 00000000000000..09e73bf4a44b26 --- /dev/null +++ b/ports/llfio/fix-arm64-build.patch @@ -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") + else() + set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++${CMAKE_CXX_STANDARD}") + endif() diff --git a/ports/llfio/portfile.cmake b/ports/llfio/portfile.cmake index f896ba23920d19..a26e8563091fa7 100644 --- a/ports/llfio/portfile.cmake +++ b/ports/llfio/portfile.cmake @@ -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( @@ -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 diff --git a/ports/llfio/vcpkg.json b/ports/llfio/vcpkg.json index d35443deb38b3f..745f398fd1bece 100644 --- a/ports/llfio/vcpkg.json +++ b/ports/llfio/vcpkg.json @@ -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", @@ -15,6 +16,9 @@ "host": true } ], + "default-features": [ + "cxx17" + ], "features": { "cxx17": { "description": "Do not polyfill C++17 entities", diff --git a/versions/baseline.json b/versions/baseline.json index d6057270247797..79d2d5c9865b94 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4170,7 +4170,7 @@ }, "llfio": { "baseline": "2.0-20220112", - "port-version": 0 + "port-version": 1 }, "llgl": { "baseline": "2019-08-15", diff --git a/versions/l-/llfio.json b/versions/l-/llfio.json index f2a4b5461d84e2..5eb09d95e2308c 100644 --- a/versions/l-/llfio.json +++ b/versions/l-/llfio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64983838b051699afafbaaf552472431e21f11bb", + "version-string": "2.0-20220112", + "port-version": 1 + }, { "git-tree": "aaacb49264f3175de57367f28c90bd3904d7209f", "version-string": "2.0-20220112",