[63295] trunk/dports/lang/spidermonkey/Portfile

[mcalhoun at macports.org]

Revision: 63295
          http://trac.macports.org/changeset/63295
Author:   mcalhoun at macports.org
Date:     2010-01-31 16:20:01 -0800 (Sun, 31 Jan 2010)
Log Message:
-----------
spidermonkey: Ensure build_arch is used.
   Allow universal build.
   Remove call to ranlib since it is nor redundant (added in r13964) and would make universal build more difficult.

Revision Links:
--------------
    http://trac.macports.org/changeset/13964

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

Modified: trunk/dports/lang/spidermonkey/Portfile
===================================================================
--- trunk/dports/lang/spidermonkey/Portfile	2010-01-31 23:54:51 UTC (rev 63294)
+++ trunk/dports/lang/spidermonkey/Portfile	2010-02-01 00:20:01 UTC (rev 63295)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup  muniversal 1.0
 
 name                spidermonkey
 epoch               1
@@ -49,18 +50,23 @@
 build.args          -f Makefile.ref \
                     LIBDIR="/lib" \
                     SO_SUFFIX=dylib \
-                    JS_THREADSAFE=1 CC=${configure.cc} \
+                    JS_THREADSAFE=1 \
                     DEFINES=-DJS_C_STRINGS_ARE_UTF8
 
+if { ![variant_isset universal] } {
+    build.args-append CC='${configure.cc} -arch ${build_arch}'
+} else {
+    set merger_must_run_binaries "yes"
+    foreach arch {i386 x86_64 ppc ppc64} {
+        lappend merger_build_args(${arch}) CC='${configure.cc} -arch ${arch}'
+    }
+}
+
 variant fileobject description {add File object support} {
     build.args-append \
         JS_HAS_FILE_OBJECT=1
 }
 
-post-build {
-    system "ranlib ${worksrcpath}/Darwin_OPT.OBJ/libjs.a"
-}
-
 destroot.args       -f Makefile.ref LIBDIR="/lib" SO_SUFFIX=dylib
 
 livecheck.type      regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100131/c9c754d2/attachment.html>