[95691] trunk/dports/x11

[ryandesign at macports.org]

Revision: 95691
          https://trac.macports.org/changeset/95691
Author:   ryandesign at macports.org
Date:     2012-07-19 05:11:08 -0700 (Thu, 19 Jul 2012)
Log Message:
-----------
pango, pango-devel: fix build for non-default build_arch

Modified Paths:
--------------
    trunk/dports/x11/pango/Portfile
    trunk/dports/x11/pango-devel/Portfile

Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile	2012-07-19 11:58:47 UTC (rev 95690)
+++ trunk/dports/x11/pango/Portfile	2012-07-19 12:11:08 UTC (rev 95691)
@@ -101,6 +101,9 @@
                         --disable-silent-rules \
                         --without-x
 
+# gobject-introspection uses g-ir-scanner, which uses $CC from env
+build.args-append       CC="${configure.cc} ${configure.cc_archflags}"
+
 variant builtin_modules description {Build the modules into Pango statically (most users do not need this variant)} {
     configure.args-append   --with-included-modules
 }
@@ -114,14 +117,6 @@
                             --x-lib=${prefix}/lib
 }
 
-# The rules enabled by gobject-introspection require GNU make 3.81+, #35203
-platform darwin 8 {
-    depends_build-append    port:gmake
-    build.cmd               ${prefix}/bin/gmake
-}
-# gobject-introspection uses $CC from env
-build.env-append        CC='${configure.cc}'
-
 if {[variant_isset no_x11]} {
     default_variants -x11
 } else {
@@ -150,6 +145,12 @@
         ${destroot}${docdir}
 }
 
+# The rules enabled by gobject-introspection require GNU make 3.81+, #35203
+platform darwin 8 {
+    depends_build-append    port:gmake
+    build.cmd               ${prefix}/bin/gmake
+}
+
 test.run                yes
 test.target             check
 

Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile	2012-07-19 11:58:47 UTC (rev 95690)
+++ trunk/dports/x11/pango-devel/Portfile	2012-07-19 12:11:08 UTC (rev 95691)
@@ -103,13 +103,8 @@
                         --disable-silent-rules \
                         --without-x
 
-# The rules enabled by gobject-introspection require GNU make 3.81+, #35203
-platform darwin 8 {
-    depends_build-append    port:gmake
-    build.cmd               ${prefix}/bin/gmake
-}
 # gobject-introspection uses g-ir-scanner, which uses $CC from env
-build.env-append        CC=${configure.cc}
+build.args-append       CC="${configure.cc} ${configure.cc_archflags}"
 
 variant builtin_modules description {Build the modules into Pango statically (most users do not need this variant)} {
     configure.args-append   --with-included-modules
@@ -152,6 +147,12 @@
         ${destroot}${docdir}
 }
 
+# The rules enabled by gobject-introspection require GNU make 3.81+, #35203
+platform darwin 8 {
+    depends_build-append    port:gmake
+    build.cmd               ${prefix}/bin/gmake
+}
+
 test.run                yes
 test.target             check
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120719/f99aadb6/attachment-0001.html>