From c280737c37d294c88eb047d359e18285f877cf83 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Tue, 22 Oct 2024 12:53:38 -0700
Subject: [PATCH] 7-zip: Only build Windows sources for Windows.

I've got no idea why these were here (it was in the initial PR without
any explanation) and can't make any sense of the upstream makefiles, but
it seems like the things in the Windows directory ought to only be built
for Windows. This fixes compilation errors with NDK r28.
---
 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 4c7cad9b16933e..5e84c276357560 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 6069307f0e38b8..6d12dea02d8cf1 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 f5e3119caf5e6a..c8bc381d268d3e 100644
--- a/versions/7-/7zip.json
+++ b/versions/7-/7zip.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "78b0dcecad2ece5cd9cb30f258e0ad92dfeea8cf",
+      "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 320fa9467fb86f..190325db3cadfd 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",