Changeset 134832


Ignore:
Timestamp:
Apr 8, 2015, 1:33:26 PM (4 years ago)
Author:
jmr@…
Message:

muniversal portgroup: use {*} instead of eval where needed, and remove a number of unnecessary evals

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

    r127044 r134832  
    125125    }
    126126
    127     eval configure.args-append      ${configure.universal_args}
    128     eval configure.cflags-append    ${configure.universal_cflags}
    129     eval configure.cxxflags-append  ${configure.universal_cxxflags}
    130     eval configure.objcflags-append ${configure.universal_cflags}
    131     eval configure.ldflags-append   ${configure.universal_ldflags}
    132     eval configure.cppflags-append  ${configure.universal_cppflags}
     127    configure.args-append      {*}${configure.universal_args}
     128    configure.cflags-append    {*}${configure.universal_cflags}
     129    configure.cxxflags-append  {*}${configure.universal_cxxflags}
     130    configure.objcflags-append {*}${configure.universal_cflags}
     131    configure.ldflags-append   {*}${configure.universal_ldflags}
     132    configure.cppflags-append  {*}${configure.universal_cppflags}
    133133
    134134    # user has specified that build platform must be able to run binaries for supported architectures
     
    291291            if { [string match "${worksrcpath}/*" ${configure.dir}] } {
    292292                # The configure directory is inside the source directory, so put in the new source directory name.
    293                 eval configure.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${configure.dir}]
     293                configure.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${configure.dir}]
    294294            } else {
    295295                # The configure directory is outside the source directory, so give it a new name by appending ${arch}.
     
    303303            if { [string match "${worksrcpath}/*" ${autoreconf.dir}] } {
    304304                # The autoreconf directory is inside the source directory, so put in the new source directory name.
    305                 eval autoreconf.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${autoreconf.dir}]
     305                autoreconf.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${autoreconf.dir}]
    306306            } else {
    307307                # The autoreconf directory is outside the source directory, so give it a new name by appending ${arch}.
     
    315315
    316316            # Undo changes to the configure related variables
    317             eval autoreconf.dir ${autoreconf_dir_save}
    318             eval configure.dir  ${configure_dir_save}
    319             eval configure.compiler ${configure_compiler_save}
    320             eval configure.f90  ${configure_f90_save}
    321             eval configure.f77  ${configure_f77_save}
    322             eval configure.fc   ${configure_fc_save}
    323             eval configure.cc   ${configure_cc_save}
    324             eval configure.cxx  ${configure_cxx_save}
    325             eval configure.objc ${configure_objc_save}
     317            autoreconf.dir ${autoreconf_dir_save}
     318            configure.dir  ${configure_dir_save}
     319            configure.compiler ${configure_compiler_save}
     320            configure.f90  ${configure_f90_save}
     321            configure.f77  ${configure_f77_save}
     322            configure.fc   ${configure_fc_save}
     323            configure.cc   ${configure_cc_save}
     324            configure.cxx  ${configure_cxx_save}
     325            configure.objc ${configure_objc_save}
    326326            if { [info exists merger_configure_args(${arch})] } {
    327327                configure.args-delete  $merger_configure_args(${arch})
     
    371371            if { [string match "${worksrcpath}/*" ${build.dir}] } {
    372372                # The build directory is inside the source directory, so put in the new source directory name.
    373                 eval build.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${build.dir}]
     373                build.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${build.dir}]
    374374            } else {
    375375                # The build directory is outside the source directory, so give it a new name by appending ${arch}.
     
    382382            portbuild::build_main
    383383
    384             eval build.dir ${build_dir_save}
     384            build.dir ${build_dir_save}
    385385            if { [info exists merger_build_args(${arch})] } {
    386386                build.args-delete $merger_build_args(${arch})
     
    397397            copy ${destroot} ${workpath}/destroot-${arch}
    398398            set destdirSave ${destroot.destdir}
    399             eval destroot.destdir [string map "${destroot} ${workpath}/destroot-${arch}" ${destroot.destdir}]
     399            destroot.destdir [string map "${destroot} ${workpath}/destroot-${arch}" ${destroot.destdir}]
    400400
    401401            if { [info exists merger_destroot_env(${arch})] } {
     
    408408            if { [string match "${worksrcpath}/*" ${destroot.dir}] } {
    409409                # The destroot directory is inside the source directory, so put in the new source directory name.
    410                 eval destroot.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${destroot.dir}]
     410                destroot.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${destroot.dir}]
    411411            } else {
    412412                # The destroot directory is outside the source directory, so give it a new name by appending ${arch}.
     
    426426                destroot.env-delete  $merger_destroot_env(${arch})
    427427            }
    428             eval destroot.destdir ${destdirSave}
     428            destroot.destdir ${destdirSave}
    429429        }
    430430        delete ${destroot}
     
    720720                if { [string match "${worksrcpath}/*" ${test.dir}] } {
    721721                    # The test directory is inside the source directory, so put in the new source directory name.
    722                     eval test.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${test.dir}]
     722                    test.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${test.dir}]
    723723                } else {
    724724                    # The test directory is outside the source directory, so give it a new name by appending ${arch}.
Note: See TracChangeset for help on using the changeset viewer.