Changeset 87964


Ignore:
Timestamp:
Dec 14, 2011, 1:05:40 PM (8 years ago)
Author:
michaelld@…
Message:

octave-devel: addresses tickets #30247, #32351, and #32378. Remove dependency on port:arpack because it is now solely internal; remove configure mods for FLTK and -arch; include variants to use MacPorts' atlas or Apple's Accelerate; use llvm-gcc-4.2, not clang, for now; when using FLTK, add runtime dependencies on ports epstool, transfig, and pstoedit.

Location:
trunk/dports/math/octave-devel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/math/octave-devel/Portfile

    r86119 r87964  
    66name                octave-devel
    77version             3.4.3
     8revision            1
    89conflicts           octave
    910categories          math science
     
    3738                    port:texinfo
    3839
    39 depends_lib         port:arpack \
    40                     port:atlas \
    41                     port:curl \
     40depends_lib         port:curl \
    4241                    port:fftw-3 \
    4342                    port:fftw-3-single \
     
    5756                    port:SuiteSparse
    5857
    59 # allow non-Apple compilers to work with FLTK by removing the -arch
    60 # flag, which means this port cannot easily compile as universal.
    61 patchfiles-append patch-configure.diff
     58# allow us to disable checking for FLTK
     59# via the environment variable "FLTK_CONFIG"
     60patchfiles-append   patch-configure.diff
    6261
    6362universal_variant   no
     63
     64# do not use CLANG (yet)
     65if {${configure.compiler} == "clang"} {
     66    configure.compiler llvm-gcc-4.2
     67}
    6468
    6569configure.args      --disable-dependency-tracking \
     
    101105}
    102106
     107variant atlas description {use BLAS from ATLAS} conflicts accelerate {
     108    depends_lib-append port:atlas
     109}
     110
     111variant accelerate description {use BLAS from Apple's Accelerate.framework} conflicts atlas {
     112    depends_lib-append      port:dotwrp
     113    configure.args-append   --with-blas="-ldotwrp -framework Accelerate"
     114    configure.args-append   --with-lapack="-framework Accelerate"
     115}
     116
     117if {[variant_isset g95]} {
     118    default_variants +accelerate
     119} elseif {![variant_isset accelerate]} {
     120    default_variants +atlas
     121}
     122
    103123# check for GCC / G95 variants.  The default here must match the
    104 # default found in the 'arpack' and 'atlas' ports.
     124# default found in the 'atlas' port (but, this is not checked for).
    105125
    106126# check for setting the default variant (gcc44)
     
    160180}
    161181
    162 # FLTK does work as of 1.3.x-r8635, so allow it as an option
    163182variant fltk description {Include FLTK for graphical front-end} {
    164183    depends_lib-append port:fltk-devel
     184    depends_run-append  port:epstool \
     185                        port:transfig \
     186                        port:pstoedit
    165187    configure.env-delete FLTK_CONFIG=no
    166188}
  • trunk/dports/math/octave-devel/files/patch-configure.diff

    r79770 r87964  
    3131 
    3232   warn_fltk_config=""
    33 @@ -33257,11 +33273,29 @@
    34    else
    35      FLTK_CFLAGS="`$FLTK_CONFIG $fltkconf_args --use-gl --cflags`"
    36      FLTK_LDFLAGS="`$FLTK_CONFIG $fltkconf_args --use-gl --ldflags`"
    37 -
    38      case "$canonical_host_type" in
    39        *-*-mingw*)
    40          FLTK_LDFLAGS="`echo $FLTK_LDFLAGS | sed -e 's/-mwindows//g'`"
    41        ;;
    42 +      *-apple-darwin*)
    43 +           { $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_CFLAGS" >&5
    44 +               $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_CFLAGS" >&6; }
    45 +           { $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_LDFLAGS" >&5
    46 +               $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_LDFLAGS" >&6; }
    47 +        # see if computer version is 'apple' or not
    48 +       case `$CXX --version` in
    49 +         *apple*|*Apple*) ;;
    50 +         *)
    51 +            # not apple; remove '-arch' flag(s) from FLTK FLAGS
    52 +           FLTK_CFLAGS=`echo $FLTK_CLFAGS | sed -e 's@-arch [^ ]*@@'`
    53 +           FLTK_LDFLAGS=`echo $FLTK_LDFLAGS | sed -e 's@-arch [^ ]*@@'`
    54 +           { $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_CFLAGS" >&5
    55 +               $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_CFLAGS" >&6; }
    56 +           { $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_LDFLAGS" >&5
    57 +               $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_LDFLAGS" >&6; }
    58 +           ;;
    59 +       esac
    60 +      ;;
    61      esac
    62  
    63      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL support in FLTK" >&5
Note: See TracChangeset for help on using the changeset viewer.