[46169] trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

[mcalhoun at macports.org]

Revision: 46169
          http://trac.macports.org/changeset/46169
Author:   mcalhoun at macports.org
Date:     2009-01-30 13:10:30 -0800 (Fri, 30 Jan 2009)
Log Message:
-----------
muniversal-1.0.tcl: Allow build.env to be set for each architecture.
Fix typo in debug message.
Proposed in #17090.

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2009-01-30 21:00:30 UTC (rev 46168)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2009-01-30 21:10:30 UTC (rev 46169)
@@ -34,6 +34,7 @@
 
 # User variables:
 #         merger_configure_env: associative array of configure.env variables
+#             merger_build_env: assoicative array of build.env variables
 #                  merger_host: associative array of host values
 #        merger_configure_args: associative array of configure.args
 #    merger_configure_cppflags: associative array of configure.cppflags
@@ -177,8 +178,15 @@
     build {
         foreach arch ${universal_archs_to_use} {
             ui_msg "universal: Running build for architecture ${arch}"
+            
+            if { [info exists merger_build_env(${arch})] } {
+                build.env-append  $merger_build_env(${arch})
+            }
             build.dir  ${workpath}/${arch}
             build_main
+            if { [info exists merger_build_env(${arch})] } {
+                build.env-delete  $merger_build_env(${arch})
+            }
         }
     }
 
@@ -243,7 +251,7 @@
                         # Files are neither directories nor links
                         if { ! [catch {system "/usr/bin/cmp ${dir1}/${fl} ${dir2}/${fl} && /bin/cp -v ${dir1}/${fl} ${dir}"}] } {
                             # Files are byte by byte the same
-                            ui_debug "universal: merge: ${prefixDir}${fl} is identical in ${base1} and ${base2}"
+                            ui_debug "universal: merge: ${prefixDir}/${fl} is identical in ${base1} and ${base2}"
                         } else {
                             # Actually try to merge the files
                             # First try lipo
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090130/0116c512/attachment.html>