[92155] trunk/dports/lang/guile/Portfile

jeremyhu at macports.org jeremyhu at macports.org
Fri Apr 20 10:16:31 PDT 2012


Revision: 92155
          https://trac.macports.org/changeset/92155
Author:   jeremyhu at macports.org
Date:     2012-04-20 10:16:31 -0700 (Fri, 20 Apr 2012)
Log Message:
-----------
guile: Fix +universal builds

Modified Paths:
--------------
    trunk/dports/lang/guile/Portfile

Modified: trunk/dports/lang/guile/Portfile
===================================================================
--- trunk/dports/lang/guile/Portfile	2012-04-20 16:03:41 UTC (rev 92154)
+++ trunk/dports/lang/guile/Portfile	2012-04-20 17:16:31 UTC (rev 92155)
@@ -69,10 +69,36 @@
     reinplace "s|-Werror -Wmissing-braces|-Werror=missing-braces|" ${worksrcpath}/configure
 }
 
-if {${os.platform} == "darwin" && ($build_arch == "x86_64" || $build_arch == "ppc64")} {
-    configure.args-append --build=${build_arch}-apple-darwin${os.version}
+# Does not support cross compilation
+if {[string match "ppc*" ${build_arch}]} {
+    supported_archs ppc ppc64
+} elseif {${os.major} < 11} {
+    supported_archs i386 x86_64 ppc
+} else {
+    supported_archs i386 x86_64
 }
 
+platform darwin {
+    if {[variant_isset universal]} {
+        set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
+        set merger_host(i386) i686-apple-${os.platform}${os.major}
+        set merger_host(ppc64) powerpc64-apple-${os.platform}${os.major}
+        set merger_host(ppc) powerpc-apple-${os.platform}${os.major}
+        set merger_configure_args(x86_64) "--build=x86_64-apple-${os.platform}${os.major}"
+        set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major}"
+        set merger_configure_args(ppc) "--build=powerpc-apple-${os.platform}${os.major}"
+        set merger_configure_args(ppc64) "--build=powerpc64-apple-${os.platform}${os.major}"
+    } elseif {${build_arch} == "i386"} {
+        configure.args-append \
+            --host=i686-apple-${os.platform}${os.major} \
+            --build=i686-apple-${os.platform}${os.major}
+    } else {
+        configure.args-append \
+            --host=${os.arch}-apple-${os.platform}${os.major} \
+            --build=${os.arch}-apple-${os.platform}${os.major}
+    }
+}
+
 #post-destroot	{
 #		  file delete ${destroot}${prefix}/share/${name}/1.6/ice-9/and-let\*.scm
 #		}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120420/e9348063/attachment.html>


More information about the macports-changes mailing list