Skip to content

[mman] only windows #22453

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

Merged
nicole mazzuca (strega-nil-ms) merged 1 commit into from
Jan 10, 2022
Merged

[mman] only windows #22453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 4 additions & 7 deletions ports/mman/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()
11 changes: 9 additions & 2 deletions ports/mman/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
]
}
2 changes: 0 additions & 2 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
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 @@ -4454,7 +4454,7 @@
},
"mman": {
"baseline": "git-f5ff813",
"port-version": 4
"port-version": 5
},
"mmloader": {
"baseline": "2021-12-13",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mman.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fff4dfa412b18aa027005a5ea952932cbf10cd74",
"version-string": "git-f5ff813",
"port-version": 5
},
{
"git-tree": "30ad8930ff3b29bd994587b1ff58e5205deb32bc",
"version-string": "git-f5ff813",
Expand Down