[51905] trunk/dports

[toby at macports.org]

Revision: 51905
          http://trac.macports.org/changeset/51905
Author:   toby at macports.org
Date:     2009-06-06 01:29:04 -0700 (Sat, 06 Jun 2009)
Log Message:
-----------
still more preparation for universal_sysroot removal

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac/Portfile
    trunk/dports/audio/lame/Portfile

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2009-06-06 08:25:44 UTC (rev 51904)
+++ trunk/dports/aqua/qt4-mac/Portfile	2009-06-06 08:29:04 UTC (rev 51905)
@@ -221,7 +221,9 @@
             configure.args-append -arch ${arch}
         }
     }
-    configure.args-append -sdk ${universal_sysroot}
+    if {[info exists universal_sysroot]} {
+        configure.args-append -sdk ${universal_sysroot}
+    }
 }
 
 livecheck.check     regex

Modified: trunk/dports/audio/lame/Portfile
===================================================================
--- trunk/dports/audio/lame/Portfile	2009-06-06 08:25:44 UTC (rev 51904)
+++ trunk/dports/audio/lame/Portfile	2009-06-06 08:29:04 UTC (rev 51905)
@@ -51,7 +51,10 @@
   configure {
     foreach arch ${my_universal_archs} {
       set my_arch_flag "-arch ${arch}"
-      set my_cflags "${configure.cflags} -isysroot ${universal_sysroot} ${my_arch_flag} -I${prefix}/include -L${prefix}/lib"
+      set my_cflags "${configure.cflags} ${my_arch_flag} -I${prefix}/include -L${prefix}/lib"
+      if {[info exists universal_sysroot]} {
+        set my_cflags "${my_cflags} -isysroot ${universal_sysroot}"
+      }
       set my_ldflags "${configure.ldflags} ${my_arch_flag}"
       set pcp "{prefix}/lib/pkgconfig"
 	    set my_configure_args "CC=\"gcc -arch ${arch}\""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090606/6b25bc14/attachment.html>