Ticket #13616: numpy-destroot.diff

File numpy-destroot.diff, 3.2 KB (added by skymoo (Adam Mercer), 16 years ago)

remove fortran compiler specification from destroot phase

  • python/py-numpy/Portfile 

    === modified file 'python/py-numpy/Portfile'
     
    2424
    2525variant g95 conflicts gcc42 gcc43 description "Use g95 as fortran compiler" {
    2626  depends_lib-append    port:g95
    27   set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/g95 --f90exec ${prefix}/bin/g95"
    28   build.cmd-append      ${fc_options}
    29   destroot.cmd-append   ${fc_options}
     27  build.cmd-append      "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/g95 --f90exec ${prefix}/bin/g95"
    3028}
    3129 
    3230variant gcc42 conflicts g95 gcc43 description "Use gfortran as fortran compiler" {
    3331  depends_lib-append    port:gcc42
    34   set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
    35   build.cmd-append      ${fc_options}
    36   destroot.cmd-append   ${fc_options}
     32  build.cmd-append      "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
    3733}
    3834 
    3935variant gcc43 conflicts g95 gcc42 description "Use gfortran as fortran compiler" {
    4036  depends_lib-append    port:gcc43
    41   set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3"
    42   build.cmd-append      ${fc_options}
    43   destroot.cmd-append   ${fc_options}
     37  build.cmd-append      "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3"
    4438}
    4539 
    4640if { ![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] } {

  • python/py25-numpy/Portfile 

    === modified file 'python/py25-numpy/Portfile'
     
    2525
    2626variant g95 conflicts gcc42 gcc43 description "Use g95 as fortran compiler" {
    2727  depends_lib-append    port:g95
    28   set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/g95 --f90exec ${prefix}/bin/g95"
    29   build.cmd-append      ${fc_options}
    30   destroot.cmd-append   ${fc_options}
     28  build.cmd-append      "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/g95 --f90exec ${prefix}/bin/g95"
    3129}
    3230 
    3331variant gcc42 conflicts g95 gcc43 description "Use gfortran as fortran compiler" {
    3432  depends_lib-append    port:gcc42
    35   set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
    36   build.cmd-append      ${fc_options}
    37   destroot.cmd-append   ${fc_options}
     33  build.cmd-append      "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
    3834}
    3935 
    4036variant gcc43 conflicts g95 gcc42 description "Use gfortran as fortran compiler" {
    4137  depends_lib-append    port:gcc43
    42   set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3"
    43   build.cmd-append      ${fc_options}
    44   destroot.cmd-append   ${fc_options}
     38  build.cmd-append      "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3"
    4539}
    4640 
    4741if { ![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] } {