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

jmr at macports.org jmr at macports.org
Sat Dec 19 03:11:27 PST 2009


Revision: 61702
          http://trac.macports.org/changeset/61702
Author:   jmr at macports.org
Date:     2009-12-19 03:11:24 -0800 (Sat, 19 Dec 2009)
Log Message:
-----------
openssl: replace universal_sysroot usage with fixed sysroot for ppc tiger, remove 1.7 workarounds

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

Modified: trunk/dports/devel/openssl/Portfile
===================================================================
--- trunk/dports/devel/openssl/Portfile	2009-12-19 10:54:35 UTC (rev 61701)
+++ trunk/dports/devel/openssl/Portfile	2009-12-19 11:11:24 UTC (rev 61702)
@@ -66,23 +66,16 @@
 	configure.cmd	./Configure
 
 	post-patch {
-		# For universal builds, add "-isysroot ${universal_sysroot}" to compiler options
-		if {[info exists universal_sysroot]} {
-			reinplace "s|\\(-arch \[_a-zA-Z0-9\]*\\)|\\1 -isysroot ${universal_sysroot}|" ${worksrcpath}/Configure
-		}
+        # 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
 	configure.args-delete  --disable-dependency-tracking
-	# workaround for #17865
-	if {![info exists configure.universal_args]} {
-	    configure.universal_args
-	}
-	if {![info exists configure.args]} {
-	    configure.args
-	}
 
 	pre-destroot {
 		global merger_dont_diff
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091219/0a5b7294/attachment.html>


More information about the macports-changes mailing list