Ticket #32702: octave-devel.patch

File octave-devel.patch, 2.9 KB (added by lukas.reichlin@…, 13 years ago)

Patch

  • (a) Portfile_orig vs. (b) Portfile

    a b  
    55
    66name                octave-devel
    77version             3.4.3
    8 revision            1
     8revision            2
    99conflicts           octave
    1010categories          math science
    1111maintainers         michaelld openmaintainer
     
    9898    patchfiles-append patch-src-display.cc.diff
    9999}
    100100
    101 variant gcc43 description {build with the macports gcc43 toolchain} conflicts gcc46 gcc45 gcc44 g95 {}
     101variant gcc43 description {build with the macports gcc43 toolchain} conflicts gcc47 gcc46 gcc45 gcc44 g95 {}
    102102
    103 variant gcc44 description {build with the macports gcc44 toolchain} conflicts gcc46 gcc45 gcc43 g95 {}
     103variant gcc44 description {build with the macports gcc44 toolchain} conflicts gcc47 gcc46 gcc45 gcc43 g95 {}
    104104
    105 variant gcc45 description {build with the macports gcc45 toolchain} conflicts gcc46 gcc44 gcc43 g95 {}
     105variant gcc45 description {build with the macports gcc45 toolchain} conflicts gcc47 gcc46 gcc44 gcc43 g95 {}
    106106
    107 variant gcc46 description {build with the macports gcc45 toolchain} conflicts gcc45 gcc44 gcc43 g95 {}
     107variant gcc46 description {build with the macports gcc46 toolchain} conflicts gcc47 gcc45 gcc44 gcc43 g95 {}
    108108
    109 variant g95 description {build with g95} conflicts gcc43 gcc44 gcc45 gcc46 {
     109variant gcc47 description {build with the macports gcc47 toolchain} conflicts gcc46 gcc45 gcc44 gcc43 g95 {}
     110
     111variant g95 description {build with g95} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 {
    110112    depends_build-append    port:g95
    111113    configure.f77           "${prefix}/bin/g95"
    112114}
     
    117119
    118120variant accelerate description {use BLAS from Apple's Accelerate.framework} conflicts atlas {
    119121    depends_lib-append      port:dotwrp
    120     configure.args-append   --with-blas="-ldotwrp -framework Accelerate"
    121     configure.args-append   --with-lapack="-framework Accelerate"
     122    configure.args-append   --with-blas="-ldotwrp -Wl,-framework -Wl,Accelerate"
     123    configure.args-append   --with-lapack="-Wl,-framework -Wl,Accelerate"
    122124}
    123125
    124126if {[variant_isset g95]} {
     
    133135# check for setting the default variant (gcc44)
    134136if { ![variant_isset gcc43] && ![variant_isset gcc44] && \
    135137         ![variant_isset gcc45] && ![variant_isset gcc46] && \
    136          ![variant_isset g95] } {
     138         ![variant_isset gcc47] && ![variant_isset g95] } {
    137139    default_variants +gcc44
    138140}
    139141
    140142# check if the user disabled just the default variant: -gcc44
    141143if { ![variant_isset gcc43] && ![variant_isset gcc44] && \
    142144         ![variant_isset gcc45] && ![variant_isset gcc46] && \
    143          ![variant_isset g95] } {
     145         ![variant_isset gcc47] && ![variant_isset g95] } {
    144146    error "You cannot use the variant -gcc44 alone."
    145147}
    146148
     
    153155    set gcc_version "4.5"
    154156} elseif {[variant_isset gcc46]} {
    155157    set gcc_version "4.6"
     158} elseif {[variant_isset gcc47]} {
     159    set gcc_version "4.7"
    156160}
    157161
    158162if {${gcc_version} != ""} {