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

mcalhoun at macports.org mcalhoun at macports.org
Sun Jan 31 15:00:26 PST 2010


Revision: 63292
          http://trac.macports.org/changeset/63292
Author:   mcalhoun at macports.org
Date:     2010-01-31 15:00:23 -0800 (Sun, 31 Jan 2010)
Log Message:
-----------
muniversal-1.0.tcl: Add ability to modify build.args for each architecture (via merger_build_args).

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	2010-01-31 22:54:44 UTC (rev 63291)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2010-01-31 23:00:23 UTC (rev 63292)
@@ -37,6 +37,7 @@
 #             merger_build_env: associative array of build.env variables
 #                  merger_host: associative array of host values
 #        merger_configure_args: associative array of configure.args
+#            merger_build_args: associative array of build.args
 #    merger_configure_cppflags: associative array of configure.cppflags
 #      merger_configure_cflags: associative array of configure.cflags
 #    merger_configure_cxxflags: associative array of configure.cxxflags
@@ -325,6 +326,9 @@
             if { [info exists merger_build_env(${arch})] } {
                 build.env-append  $merger_build_env(${arch})
             }
+            if { [info exists merger_build_args(${arch})] } {
+                build.args-append  $merger_build_args(${arch})
+            }
             set build_dir_save  ${build.dir}
             if { [string match "${worksrcpath}/*" ${build.dir}] } {
                 # The build directory is inside the source directory, so put in the new source directory name.
@@ -342,6 +346,9 @@
                 build_main
             }
             eval build.dir  ${build_dir_save}
+            if { [info exists merger_build_args(${arch})] } {
+                build.args-delete $merger_build_args(${arch})
+            }
             if { [info exists merger_build_env(${arch})] } {
                 build.env-delete  $merger_build_env(${arch})
             }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100131/d3a195ad/attachment.html>


More information about the macports-changes mailing list