Changeset 148973 for trunk/dports/math


Ignore:
Timestamp:
May 24, 2016, 1:49:14 AM (3 years ago)
Author:
dstrubbe@…
Message:

qrupdate: Use linear_algebra port group. This corrects the wrong description of +openblas too.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/math/qrupdate/Portfile

    r144149 r148973  
    55PortGroup           muniversal 1.0
    66PortGroup           compilers 1.0
     7PortGroup           linear_algebra 1.0
    78
    89compilers.choose    fc
     
    2930build.target        lib solib
    3031
    31 build.args          PREFIX=${prefix}
    32 destroot.args       PREFIX=${prefix}
    33 test.args           PREFIX=${prefix}
     32build.args          PREFIX=${prefix} LAPACK=""
     33destroot.args       PREFIX=${prefix} LAPACK=""
     34test.args           PREFIX=${prefix} LAPACK=""
    3435
    3536patchfiles          patch-Makefile.diff
     
    4344}
    4445
    45 # Fortran compilers can not cross-compile
     46# Fortran compilers cannot cross-compile
    4647if {${os.arch} eq "i386"} {
    4748    set universal_archs_supported "i386 x86_64"
     
    6667        }
    6768    }
    68 }
    6969
    70 variant atlas conflicts accelerate openblas description {build with atlas instead of Accelerate framework} {
    71     depends_lib-append      port:atlas
    72     build.args-append       BLAS=-ltatlas LAPACK=-llapack
    73     destroot.args-append    BLAS=-ltatlas LAPACK=-llapack
    74     test.args-append        BLAS=-ltatlas LAPACK=-llapack
    75 }
    76 
    77 variant accelerate conflicts atlas openblas description {build with Accelerate framework} {
    78     depends_lib-append      port:vecLibFort
    79     build.args-append       BLAS=-lvecLibFort LAPACK=-lvecLibFort
    80     destroot.args-append    BLAS=-lvecLibFort LAPACK=-lvecLibFort
    81     test.args-append        BLAS=-lvecLibFort LAPACK=-lvecLibFort
    82 }
    83 
    84 variant openblas conflicts accelerate atlas description {build with Accelerate framework} {
    85     PortGroup               active_variants 1.1
    86 
    87     depends_lib-append      path:lib/libopenblas.dylib:OpenBLAS
    88     # LAPACK required
    89     require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack
    90 
    91     build.args-append       BLAS=-lopenblas   LAPACK=-lopenblas
    92     destroot.args-append    BLAS=-lopenblas   LAPACK=-lopenblas
    93     test.args-append        BLAS=-lopenblas   LAPACK=-lopenblas
    94 }
    95 
    96 if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } {
    97     default_variants-append +accelerate
    98 }
    99 
    100 if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } {
    101     ui_error "\n\nYou must select either the +accelerate, +atlas, or +openblas variant.\n"
    102     return -code error "Invalid variant selection"
     70    build.args-append       BLAS="${linalglib}"
     71    destroot.args-append    BLAS="${linalglib}"
     72    test.args-append        BLAS="${linalglib}"
    10373}
    10474
Note: See TracChangeset for help on using the changeset viewer.