wine-*: Fix platforms & building on macOS High Sierra

Currently the buildbots assume this can build on El Capitan when that's not the case so use >= instead. SDK check causes build to fail on macOS High Sierra as it looks for the SDK inside Xcode instead of "/Library/Developer/CommandLineTools/SDKs"
macports · Jan 30, 2025 · 4c56846 · 4c56846
1 parent 7fe55a2
commit 4c56846
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/emulators/wine-devel/Portfile b/emulators/wine-devel/Portfile
@@ -14,7 +14,7 @@ conflicts                   wine-stable wine-staging wine-crossover
 set my_name                 wine
 revision                    0
 # MacPorts does not support i386 on macOS Mojave and new WoW64 requires macOS Catalina 10.15.4
-platforms                   {darwin > 15 != 18.*}
+platforms                   {darwin >= 16 != 18.*}
 set branch                  [lindex [split ${version} .] 0].x
 license                     LGPL-2.1+
 categories                  emulators
@@ -204,11 +204,13 @@ variant kerberos description "Build ${subport} with Kerberos, for network authen
 }
 
 if {${os.major} < 19} {
-    # Using the 10.13 SDK as that's what CodeWeavers tests against for i386
-    configure.sdk_version   10.13
-    if {${configure.sdkroot} eq ""} {
-        pre-fetch {
-            error "Building ${subport} @${version} requires the MacOSX10.13.sdk to be present in ${developer_dir}/SDKs/"
+    if {${os.major} == 16} {
+        # Using the 10.13 SDK as that's what CodeWeavers tests against for i386
+        configure.sdk_version   10.13
+        if {${configure.sdkroot} eq ""} {
+            pre-fetch {
+                error "Building ${subport} @${version} requires the MacOSX10.13.sdk to be present in ${developer_dir}/SDKs/"
+            }
         }
     }
 

diff --git a/emulators/wine-stable/Portfile b/emulators/wine-stable/Portfile
@@ -14,7 +14,7 @@ conflicts                   wine-devel wine-staging wine-crossover
 set my_name                 wine
 revision                    0
 # MacPorts does not support i386 on macOS Mojave and new WoW64 requires macOS Catalina 10.15.4
-platforms                   {darwin > 15 != 18.*}
+platforms                   {darwin >= 16 != 18.*}
 set branch                  [lindex [split ${version} .] 0].0
 license                     LGPL-2.1+
 categories                  emulators
@@ -170,11 +170,13 @@ variant kerberos description "Build ${subport} with Kerberos, for network authen
 }
 
 if {${os.major} < 19} {
-    # Using the 10.13 SDK as that's what CodeWeavers tests against for i386
-    configure.sdk_version   10.13
-    if {${configure.sdkroot} eq ""} {
-        pre-fetch {
-            error "Building ${subport} @${version} requires the MacOSX10.13.sdk to be present in ${developer_dir}/SDKs/"
+    if {${os.major} == 16} {
+        # Using the 10.13 SDK as that's what CodeWeavers tests against for i386
+        configure.sdk_version   10.13
+        if {${configure.sdkroot} eq ""} {
+            pre-fetch {
+                error "Building ${subport} @${version} requires the MacOSX10.13.sdk to be present in ${developer_dir}/SDKs/"
+            }
         }
     }