Ticket #27343: qt4-mac-Portfile.diff

Portfile

@@ -74 +74 @@
 # only; this patch requires that (2) already be in place.
 patchfiles-append   patch-mkspecs_common_mac.conf.diff
 
+global TARGET
+set TARGET ""
+
 post-patch {
     # set ARCHES in configure (per the third patchfile above), for
     # building QMake.  join any 2 or more arch entries with the GCC
@@ -91 +94 @@
     # set MACOSX_DEPLOYMENT_TARGET version in various places.  These
     # were all patched in (2) above, and can be easily changed or
     # overridden by the user in a project-local qmake .pro script.
-    set minor [expr [lindex [split ${os.version} "."] 0] - 4]
-    set MACOSX_DEPLOYMENT_TARGET "10.${minor}"
+    # find a way to specify the TARGET to use
+    set TARGET ""
+    if {[variant_isset universal]} {
+        if {[info exists universal_target]} {
+            set TARGET ${universal_target}
+            ui_msg "Using 'universal_target' to get TARGET: '${TARGET}'"
+        }
+    }
+    if {${TARGET} == ""} {
+        if {[info exists macosx_deployment_target]} {
+            set TARGET ${macosx_deployment_target}
+            ui_msg "Using 'macosx_deployment_target' to get TARGET: '${TARGET}'"
+        }
+    }
+    # hopefully the TARGET exists and is set by now.
+    # last resort: use os.version to get target (bad)
+    if {${TARGET} == ""} {
+        set minor [expr [lindex [split ${os.version} "."] 0] - 4]
+        set TARGET "10.${minor}"
+        ui_msg "Using 'os.version' to get TARGET: '${TARGET}'"
+    }
+    ui_msg "TARGET is '${TARGET}'"
     foreach fixfile {configure mkspecs/common/mac-g++.conf \
                      mkspecs/common/mac.conf qmake/qmake.pri \
                      src/tools/bootstrap/bootstrap.pro } {
-        reinplace "s|@MACOSX_DEPLOYMENT_TARGET@|${MACOSX_DEPLOYMENT_TARGET}|g" \
+        reinplace "s|@MACOSX_DEPLOYMENT_TARGET@|${TARGET}|g" \
             ${worksrcpath}/${fixfile}
     }
 
@@ -275 +298 @@
 
         # find a way to specify the SDK to use
         set SDK ""
-        if {[variant_exists universal] && [variant_isset universal]} {
+        if {[variant_isset universal]} {
             if {[info exists universal_sysroot]} {
                 set SDK ${universal_sysroot}
-            }
+                ui_msg "Using 'universal_sysroot' for SDK: '${SDK}'"
+             }
         }
         if {${SDK} == ""} {
-            # else use the one for this OS version, if installed
-            set minor [expr [lindex [split ${os.version} "."] 0] - 4]
+            if {[info exists configure.sdkroot]} {
+                set SDK ${configure.sdkroot}
+                ui_msg "Using 'configure.sdkroot' for SDK: '${SDK}'"
+             }
+        }
+        if {${SDK} == ""} {
+            # find a way to specify the SDK to use, based on the TARGET
+            # hopefully the TARGET exists and is set by now.
+            # last resort: use os.version to get target (bad)
+            set minor ""
+            global TARGET
+            if {${TARGET} == ""} {
+                set minor [expr [lindex [split ${os.version} "."] 0] - 4]
+            } else {
+                set minor [lindex [split ${TARGET} "."] 1]
+            }
+            ui_msg "minor is '${minor}'"
             # set SDK version depending on OS version
             set sdk_version ""
             if {${minor} == "4"} {
@@ -292 +331 @@
                 set sdk_version "10.${minor}"
             }
             set SDK ${developer_dir}/SDKs/MacOSX${sdk_version}.sdk
+            ui_msg "Using 'os.version' for SDK: '${SDK}'"
         }
         if {[file exists ${SDK}]} {
             configure.args-append -sdk ${SDK}