Ticket #25114: sdk_cleanup.diff

Portfile

@@ -53 +53 @@
 post-patch {
         # Ensure that the correct compiler is used
         reinplace "s|cc:|${configure.cc}:|" ${worksrcpath}/Configure
+        # use SDK if necessary
+        if {[info exists configure.sdkroot]} {
+            if {${configure.sdkroot} != ""} {
+                reinplace "s|\\(-arch \[_a-zA-Z0-9\]*\\)|\\1 -isysroot ${configure.sdkroot}|" ${worksrcpath}/Configure
+            }
+        } elseif {[variant_isset universal] && ${os.arch} == "powerpc" && ${os.major} == "8"} {
+        reinplace "s|\\(-arch \[_a-zA-Z0-9\]*\\)|\\1 -isysroot ${developer_dir}/SDKs/MacOSX10.4u.sdk|" ${worksrcpath}/Configure
+    }
 }
 
 array set merger_configure_args {
@@ -65 +73 @@
 if { [variant_isset universal] } {
         configure.cmd   ./Configure
 
-        post-patch {
-        # For universal builds on ppc tiger, add sysroot
-        if {${os.arch} == "powerpc" && ${os.major} == "8"} {
-            reinplace "s|\\(-arch \[_a-zA-Z0-9\]*\\)|\\1 -isysroot ${developer_dir}/SDKs/MacOSX10.4u.sdk|" ${worksrcpath}/Configure
-        }
-        }
-
         set merger_arch_compiler "no"
 
         configure.universal_args-delete --disable-dependency-tracking
@@ -91 +92 @@
                 ppc64   ""
                 x86_64  ""
         }
-} elseif {[info exists build_arch] && [info exists merger_configure_args($build_arch)]} {
+} elseif {[info exists merger_configure_args($build_arch)]} {
     configure.cmd           ./Configure
     configure.args-append   $merger_configure_args($build_arch)
 }