[105559] trunk/dports/gnome/gstreamer1/Portfile

[jeremyhu at macports.org]

Revision: 105559
          https://trac.macports.org/changeset/105559
Author:   jeremyhu at macports.org
Date:     2013-04-24 16:59:22 -0700 (Wed, 24 Apr 2013)
Log Message:
-----------
gstreamer1: Also set destroot.args for -universal

Modified Paths:
--------------
    trunk/dports/gnome/gstreamer1/Portfile

Property Changed:
----------------
    trunk/dports/gnome/gstreamer1/Portfile

Modified: trunk/dports/gnome/gstreamer1/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer1/Portfile	2013-04-24 23:56:56 UTC (rev 105558)
+++ trunk/dports/gnome/gstreamer1/Portfile	2013-04-24 23:59:22 UTC (rev 105559)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id: Portfile 102362 2013-02-01 03:43:34Z rmstonecipher at macports.org $
+# $Id$
 
 PortSystem          1.0
 
@@ -56,22 +56,22 @@
     # gobject-introspection uses g-ir-scanner, which uses $CC from env
     foreach arch ${configure.universal_archs} {
         lappend merger_build_args(${arch})  CC='${configure.cc} -arch ${arch}'
-
-        # Not sure why, but destroot tries to rebuild Gst-1.0.ir on Snow Leopard
         lappend merger_destroot_args(${arch})  CC='${configure.cc} -arch ${arch}'
     }
-} elseif {${build_arch} == "i386"} {
-    configure.args-append \
-        --host=i686-apple-${os.platform}${os.major} \
-        --build=i686-apple-${os.platform}${os.major}
-    build.args-append       CC="${configure.cc} ${configure.cc_archflags}"
-} elseif {${build_arch} == "x86_64"} {
-    configure.args-append \
-        --host=${build_arch}-apple-${os.platform}${os.major} \
-        --build=${build_arch}-apple-${os.platform}${os.major}
-    build.args-append       CC="${configure.cc} ${configure.cc_archflags}"
 } else {
+
+    if {${build_arch} == "i386"} {
+        configure.args-append \
+            --host=i686-apple-${os.platform}${os.major} \
+            --build=i686-apple-${os.platform}${os.major}
+    } elseif {${build_arch} == "x86_64"} {
+        configure.args-append \
+            --host=${build_arch}-apple-${os.platform}${os.major} \
+            --build=${build_arch}-apple-${os.platform}${os.major}
+    }
+
     build.args-append       CC="${configure.cc} ${configure.cc_archflags}"
+    destroot.args-append    CC="${configure.cc} ${configure.cc_archflags}"
 }
 
 pre-build	{


Property changes on: trunk/dports/gnome/gstreamer1/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130424/c42d09dc/attachment.html>