Revision: 105556 https://trac.macports.org/changeset/105556 Author: jeremyhu@macports.org Date: 2013-04-24 16:54:34 -0700 (Wed, 24 Apr 2013) Log Message: ----------- muniversal: Add merger_destroot_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 2013-04-24 23:54:25 UTC (rev 105555) +++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl 2013-04-24 23:54:34 UTC (rev 105556) @@ -33,9 +33,11 @@ # User variables: # merger_configure_env: associative array of configure.env variables # merger_build_env: associative array of build.env variables +# merger_destroot_env: associative array of destroot.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_destroot_args: associative array of destroot.args # merger_configure_compiler: associative array of configure.compiler # merger_configure_cppflags: associative array of configure.cppflags # merger_configure_cflags: associative array of configure.cflags @@ -44,7 +46,6 @@ # merger_configure_ldflags: associative array of configure.ldflags # merger_arch_flag: if no, -arch xxx will not be appended configure.???flags # merger_arch_compiler: if no, -arch xxx will not be appended to compilers -# merger_destroot_env: associative array of destroot.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 @@ -406,6 +407,9 @@ if { [info exists merger_destroot_env(${arch})] } { destroot.env-append $merger_destroot_env(${arch}) } + if { [info exists merger_destroot_args(${arch})] } { + destroot.args-append $merger_destroot_args(${arch}) + } set destroot_dir_save ${destroot.dir} if { [string match "${worksrcpath}/*" ${destroot.dir}] } { # The destroot directory is inside the source directory, so put in the new source directory name. @@ -421,6 +425,9 @@ portdestroot::destroot_main destroot.dir ${destroot_dir_save} + if { [info exists merger_destroot_args(${arch})] } { + destroot.args-delete $merger_destroot_args(${arch}) + } if { [info exists merger_destroot_env(${arch})] } { destroot.env-delete $merger_destroot_env(${arch}) }