From 41626fd77bf42f29e8f7e43dc1f2f05780588cde Mon Sep 17 00:00:00 2001
From: Dan Albert <daniel.j.albert@gmail.com>
Date: Wed, 23 Oct 2024 19:57:08 -0700
Subject: [PATCH] [7-zip] Only build Windows sources for Windows (#41721)

---
 ports/7zip/CMakeLists.txt | 24 ++++++++++++++----------
 ports/7zip/vcpkg.json     |  1 +
 versions/7-/7zip.json     |  5 +++++
 versions/baseline.json    |  2 +-
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ports/7zip/CMakeLists.txt b/ports/7zip/CMakeLists.txt
index 4c7cad9b16..5e84c27635 100644
--- a/ports/7zip/CMakeLists.txt
+++ b/ports/7zip/CMakeLists.txt
@@ -149,16 +149,6 @@ target_sources(7zip PRIVATE
     CPP/Common/XzCrc64Reg.cpp
     CPP/Common/Xxh64Reg.cpp
 
-    CPP/Windows/FileDir.cpp
-    CPP/Windows/FileFind.cpp
-    CPP/Windows/FileIO.cpp
-    CPP/Windows/FileName.cpp
-    CPP/Windows/PropVariant.cpp
-    CPP/Windows/PropVariantUtils.cpp
-    CPP/Windows/Synchronization.cpp
-    CPP/Windows/System.cpp
-    CPP/Windows/TimeUtils.cpp
-
     CPP/7zip/Common/CreateCoder.cpp
     CPP/7zip/Common/CWrappers.cpp
     CPP/7zip/Common/InBuffer.cpp
@@ -302,6 +292,20 @@ target_sources(7zip PRIVATE
     C/Util/LzmaLib/LzmaLib.def
 )
 
+if(WIN32)
+    target_sources(7zip PRIVATE
+        CPP/Windows/FileDir.cpp
+        CPP/Windows/FileFind.cpp
+        CPP/Windows/FileIO.cpp
+        CPP/Windows/FileName.cpp
+        CPP/Windows/PropVariant.cpp
+        CPP/Windows/PropVariantUtils.cpp
+        CPP/Windows/Synchronization.cpp
+        CPP/Windows/System.cpp
+        CPP/Windows/TimeUtils.cpp
+    )
+endif()
+
 # 7zCrcOpt
 if(VCPKG_TARGET_IS_WINDOWS)
     if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
diff --git a/ports/7zip/vcpkg.json b/ports/7zip/vcpkg.json
index 6069307f0e..6d12dea02d 100644
--- a/ports/7zip/vcpkg.json
+++ b/ports/7zip/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "7zip",
   "version-string": "24.08",
+  "port-version": 1,
   "description": "Library for archiving file with a high compression ratio.",
   "homepage": "https://www.7-zip.org",
   "license": "LGPL-2.1-or-later",
diff --git a/versions/7-/7zip.json b/versions/7-/7zip.json
index f5e3119caf..55314b96b9 100644
--- a/versions/7-/7zip.json
+++ b/versions/7-/7zip.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "36bee800b8aadc1908cc02cc1561dee40a3b43f6",
+      "version-string": "24.08",
+      "port-version": 1
+    },
     {
       "git-tree": "f8021d6c213215f0eb9e99500d348291ac5898c5",
       "version-string": "24.08",
diff --git a/versions/baseline.json b/versions/baseline.json
index ff2e17ac03..8cb56b63e7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6,7 +6,7 @@
     },
     "7zip": {
       "baseline": "24.08",
-      "port-version": 0
+      "port-version": 1
     },
     "ableton": {
       "baseline": "3.0.6",