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

[mcalhoun at macports.org]

Revision: 47438
          http://trac.macports.org/changeset/47438
Author:   mcalhoun at macports.org
Date:     2009-02-27 20:13:42 -0800 (Fri, 27 Feb 2009)
Log Message:
-----------
muniversal-1.0.tcl: Add merger_destroot_env variable, which is and assoicative array of desroot.env values.

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-02-28 03:52:08 UTC (rev 47437)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2009-02-28 04:13:42 UTC (rev 47438)
@@ -41,6 +41,7 @@
 #      merger_configure_cflags: associative array of configure.cflags
 #    merger_configure_cxxflags: associative array of configure.cxxflags
 #     merger_configure_ldflags: associative array of configure.ldflags
+#          merger_destroot_env: assoicative array of desroot.env variables
 #             merger_dont_diff: list of file names for which diff will not work
 #     merger_must_run_binaries: if yes, build platform must be able to run binaries for supported architectures
 #            merger_no_3_archs: if yes, merger will not work correctly if there are three supported architectures
@@ -248,7 +249,13 @@
             destroot.dir  ${workpath}/${arch}
             set destdirSave ${destroot.destdir}
             destroot.destdir  [string map "${destroot} ${workpath}/destroot-${arch}" ${destroot.destdir}]
+            if { [info exists merger_destroot_env(${arch})] } {
+                destroot.env-append  $merger_destroot_env(${arch})
+            }
             destroot_main
+            if { [info exists merger_destroot_env(${arch})] } {
+                destroot.env-delete  $merger_destroot_env(${arch})
+            }
             destroot.destdir ${destdirSave} 
         }
         delete ${destroot}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090227/cc2a0a1b/attachment.html>