[foonathan-memory] Fix the conflict of libs that tool depend on (micr…

…osoft#33651)
cenit · Oct 3, 2023 · 52354a3 · 52354a3
1 parent 2376cc9
commit 52354a3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/ports/foonathan-memory/portfile.cmake b/ports/foonathan-memory/portfile.cmake
@@ -2,6 +2,13 @@
 # unresolved external symbol "public: static unsigned int const foonathan::memory::detail::memory_block_stack::implementation_offset
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
+vcpkg_download_distfile(
+    REMOVE_TOOL_STATIC_LINKING_CROSS_COMPILATION_PATCH
+    URLS https://github.com/foonathan/memory/commit/abb0bff7a232572b1fce304dd2e2a2d5c0a6806c.patch?full_index=1
+    FILENAME foonathan-memory-abb0bff7a232572b1fce304dd2e2a2d5c0a6806c.patch
+    SHA512 9f16c9465a6475771241470925f34ead2281c5e2f7d9c4ddaceab77fa3775b8a63ccb6dde00061d74924f838a6d204ab70427f9ae5369245b5e9e971472e862f
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO foonathan/memory
@@ -10,6 +17,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         fix-foonathan-memory-include-install-dir.patch
+        "${REMOVE_TOOL_STATIC_LINKING_CROSS_COMPILATION_PATCH}"
 )
 
 vcpkg_from_github(

diff --git a/ports/foonathan-memory/vcpkg.json b/ports/foonathan-memory/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "foonathan-memory",
   "version": "0.7.3",
+  "port-version": 1,
   "description": "STL compatible C++ memory allocator library",
   "homepage": "https://foonathan.net/doc/memory/",
   "license": "Zlib",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2658,7 +2658,7 @@
     },
     "foonathan-memory": {
       "baseline": "0.7.3",
-      "port-version": 0
+      "port-version": 1
     },
     "forge": {
       "baseline": "1.0.8",

diff --git a/versions/f-/foonathan-memory.json b/versions/f-/foonathan-memory.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3b259607933426427c0e9cac415275c1738a6f34",
+      "version": "0.7.3",
+      "port-version": 1
+    },
     {
       "git-tree": "e5d8f014667fd2e794d0e4dab67adc193731b246",
       "version": "0.7.3",