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

[jmr at macports.org]

Revision: 55462
          http://trac.macports.org/changeset/55462
Author:   jmr at macports.org
Date:     2009-08-11 05:48:17 -0700 (Tue, 11 Aug 2009)
Log Message:
-----------
openssl: replace 10.6-specific hack with a build_arch check

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

Modified: trunk/dports/devel/openssl/Portfile
===================================================================
--- trunk/dports/devel/openssl/Portfile	2009-08-11 09:54:15 UTC (rev 55461)
+++ trunk/dports/devel/openssl/Portfile	2009-08-11 12:48:17 UTC (rev 55462)
@@ -54,6 +54,13 @@
 	reinplace "s|cc:|${configure.cc}:|" ${worksrcpath}/Configure
 }
 
+array set merger_configure_args {
+	ppc     darwin-ppc-cc
+	i386    darwin-i386-cc
+	ppc64   darwin64-ppc-cc
+	x86_64  darwin64-x86_64-cc
+}
+
 if { [variant_isset universal] } {
 	configure.cmd	./Configure
 
@@ -83,13 +90,6 @@
 		}
 	}
 
-	array set merger_configure_args {
-		ppc     darwin-ppc-cc
-		i386    darwin-i386-cc
-		ppc64   darwin64-ppc-cc
-		x86_64  darwin64-x86_64-cc
-	}
-
 	# Do not set --host.
 	array set merger_host {
 		ppc     ""
@@ -97,12 +97,9 @@
 		ppc64   ""
 		x86_64  ""
 	}
-} else {
-	# hack to force 64-bit build when the default compiler builds 64-bit binaries
-	if {${os.major} >= 10 && $tcl_platform(wordSize) == 8} {
-		configure.cmd           ./Configure
-		configure.args-append   darwin64-x86_64-cc
-	}
+} elseif {[info exists build_arch] && [info exists merger_configure_args($build_arch)]} {
+    configure.cmd           ./Configure
+    configure.args-append   $merger_configure_args($build_arch)
 }
 
 # the test suite can only be run *after* destrooting
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090811/d01852d4/attachment.html>