From 0e96f76e01758397dba13e560b2056660c61e40f Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 10 Jan 2022 22:07:18 +0100 Subject: [PATCH] [mman] only windows (#22453) --- ports/mman/portfile.cmake | 11 ++++------- ports/mman/vcpkg.json | 11 +++++++++-- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/m-/mman.json | 5 +++++ 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/ports/mman/portfile.cmake b/ports/mman/portfile.cmake index 7482a7f74a..4e57ba973a 100644 --- a/ports/mman/portfile.cmake +++ b/ports/mman/portfile.cmake @@ -8,12 +8,11 @@ vcpkg_from_github( mman-static.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include/mman) file(RENAME ${CURRENT_PACKAGES_DIR}/include/sys ${CURRENT_PACKAGES_DIR}/include/mman/sys) @@ -23,9 +22,7 @@ file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(READ ${CURRENT_PACKAGES_DIR}/include/mman/sys/mman.h _contents) - string(REPLACE "__declspec(dllimport)" "" _contents "${_contents}") - file(WRITE ${CURRENT_PACKAGES_DIR}/include/mman/sys/mman.h "${_contents}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mman/sys/mman.h" "__declspec(dllimport)" "") endif() vcpkg_copy_pdbs() diff --git a/ports/mman/vcpkg.json b/ports/mman/vcpkg.json index 37516b6799..2554140e89 100644 --- a/ports/mman/vcpkg.json +++ b/ports/mman/vcpkg.json @@ -1,7 +1,14 @@ { "name": "mman", "version-string": "git-f5ff813", - "port-version": 4, + "port-version": 5, "description": "A light implementation of the mmap functions for MinGW.", - "homepage": "https://github.com/witwall/mman-win32" + "homepage": "https://github.com/witwall/mman-win32", + "supports": "windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 429ec63d81..4d775df91e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -856,8 +856,6 @@ microsoft-signalr:x64-windows-static-md=skip microsoft-signalr:x86-windows=skip # https://github.com/mlpack/mlpack/pull/2945 mlpack:x64-uwp=fail -mman:x64-linux=fail -mman:x64-osx=fail mmloader:arm64-windows=fail mmloader:arm-uwp=fail mmloader:x64-linux=fail diff --git a/versions/baseline.json b/versions/baseline.json index e6438d350c..a78877100e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4454,7 +4454,7 @@ }, "mman": { "baseline": "git-f5ff813", - "port-version": 4 + "port-version": 5 }, "mmloader": { "baseline": "2021-12-13", diff --git a/versions/m-/mman.json b/versions/m-/mman.json index bf22423611..226b2e7d9a 100644 --- a/versions/m-/mman.json +++ b/versions/m-/mman.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fff4dfa412b18aa027005a5ea952932cbf10cd74", + "version-string": "git-f5ff813", + "port-version": 5 + }, { "git-tree": "30ad8930ff3b29bd994587b1ff58e5205deb32bc", "version-string": "git-f5ff813",