[108865] trunk/dports/gnome/gtk3/Portfile

[jeremyhu at macports.org]

Revision: 108865
          https://trac.macports.org/changeset/108865
Author:   jeremyhu at macports.org
Date:     2013-08-03 17:39:45 -0700 (Sat, 03 Aug 2013)
Log Message:
-----------
gtk3: Enable gobject-introspection on +universal as well

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

Modified: trunk/dports/gnome/gtk3/Portfile
===================================================================
--- trunk/dports/gnome/gtk3/Portfile	2013-08-04 00:26:18 UTC (rev 108864)
+++ trunk/dports/gnome/gtk3/Portfile	2013-08-04 00:39:45 UTC (rev 108865)
@@ -10,6 +10,7 @@
 name                gtk3
 set real_name       gtk+
 version             3.8.2
+revision            1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          gnome x11
 license             LGPL-2.1+
@@ -60,8 +61,17 @@
                     --disable-schemas-compile \
                     gio_can_sniff=yes
 
-# gobject-introspection uses $CC from env
-build.env-append    CC=${configure.cc}
+# gobject-introspection uses g-ir-scanner, which uses $CC from env
+if {[variant_isset universal]} { 
+    foreach arch ${configure.universal_archs} {
+        lappend merger_build_args(${arch})  CC='${configure.cc} -arch ${arch}'
+        lappend merger_destroot_args(${arch})  CC='${configure.cc} -arch ${arch}'
+    }
+} else {
+    build.args-append       CC="${configure.cc} ${configure.cc_archflags}"
+    destroot.args-append    CC="${configure.cc} ${configure.cc_archflags}"
+}
+
 build.args-append   V=1
 
 configure.ccache    no
@@ -121,9 +131,6 @@
 }
 
 if {[variant_isset universal]} {
-    # gobject-introspection breaks universal build (#35994)
-    configure.args-replace --enable-introspection --enable-introspection=no
-    depends_lib-delete port:gobject-introspection
     set cups /usr/bin/cups-config
     if {[info exists universal_sysroot]} {
         set cups ${universal_sysroot}${cups}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130803/3f3e8843/attachment.html>