[69417] trunk/dports/devel/openssl/Portfile

[jmr at macports.org]

Revision: 69417
          http://trac.macports.org/changeset/69417
Author:   jmr at macports.org
Date:     2010-07-04 23:03:12 -0700 (Sun, 04 Jul 2010)
Log Message:
-----------
openssl: add configure.sdkroot support, remove check for build_arch existence (see #25114)

Modified Paths:
--------------
    trunk/dports/devel/openssl/Portfile

Modified: trunk/dports/devel/openssl/Portfile
===================================================================
--- trunk/dports/devel/openssl/Portfile	2010-07-05 05:49:56 UTC (rev 69416)
+++ trunk/dports/devel/openssl/Portfile	2010-07-05 06:03:12 UTC (rev 69417)
@@ -53,6 +53,10 @@
 post-patch {
 	# Ensure that the correct compiler is used
 	reinplace "s|cc:|${configure.cc}:|" ${worksrcpath}/Configure
+	# use SDK if necessary
+	if {${configure.sdkroot} != ""} {
+		reinplace "s|\\(-arch \[_a-zA-Z0-9\]*\\)|\\1 -isysroot ${configure.sdkroot}|" ${worksrcpath}/Configure
+	}
 }
 
 array set merger_configure_args {
@@ -65,13 +69,6 @@
 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,7 +88,7 @@
 		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)
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100704/b3e8deb0/attachment.html>