Ignore:
Timestamp:
Jan 26, 2015, 5:26:12 PM (5 years ago)
Author:
michaelld@…
Message:

octave-linear-algebra: update to 2.2.1, making sure to use MacPorts' 'mkoctfile'.

Location:
trunk/dports/math/octave-linear-algebra
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/math/octave-linear-algebra/Portfile

    r114034 r132214  
    55PortGroup           octave 1.0
    66
    7 octave.setup        linear-algebra 2.2.0
     7octave.setup        linear-algebra 2.2.1
    88platforms           darwin
    99license             GPL-3+ LGPL-3+ FreeBSD
     
    1313long_description    ${description}
    1414
    15 checksums           rmd160 19f098c03ceace1e92cfc1cd3aceb56b4d684f46 \
    16                     sha256 a62c88a0591d325fd9e80b05a18565aa4fa923f2aad709a92d9519adb4731a20
     15checksums           rmd160 57ae599284f7c2574dbe792905d316c655dcd426 \
     16                    sha256 ccebaf6e63f25e2257ff4c0aac1591f095d9074997b6c5d5cb2ed5fa4468ee8a
    1717
    1818depends_lib-append  port:octave-general
    1919
    2020patchfiles-append   patch-src_Makefile.diff
     21
     22configure.env-append "PREFIX_BIN=${prefix}/bin"
  • trunk/dports/math/octave-linear-algebra/files/patch-src_Makefile.diff

    r114034 r132214  
    1 --- src/Makefile.orig   2013-11-25 20:40:57.000000000 -0500
    2 +++ src/Makefile        2013-11-25 20:40:46.000000000 -0500
    3 @@ -5,6 +5,7 @@
    4  endif
     1--- src/Makefile.orig   2015-01-26 12:18:46.000000000 -0500
     2+++ src/Makefile        2015-01-26 12:21:27.000000000 -0500
     3@@ -1,8 +1,6 @@
     4 sinclude Makeconf
    55 
    6  LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS)
    7 +BLAS_LIBS := $(shell mkoctfile -p BLAS_LIBS)
     6-ifndef OCTAVE_FORGE
     7-MKOCTFILE = mkoctfile
     8-endif
     9+MKOCTFILE = $(PREFIX_BIN)/mkoctfile -v
    810 
    9  DEFINES = -DHAVE_CONFIG_H -Wall
    10  GSVD_OBJECTS = gsvd.o dbleGSVD.o CmplxGSVD.o
    11 @@ -25,7 +26,7 @@
     11 ifndef LAPACK_LIBS
     12 LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS)
     13@@ -32,7 +30,7 @@
    1214 all : $(TARGETS) pgmres.oct
    1315 
     
    1820 $(GSVD_TEST) : $(GSVD_TARGET)
    1921 
    20 @@ -46,7 +47,7 @@
     22@@ -53,7 +51,7 @@
    2123        $(MKOCTFILE) $(DEFINES) $< -o $@
    2224 
    2325 %.oct: %.cc
    2426-       mkoctfile $(DEFINES) $< -o $@ ${LAPACK_LIBS}
    25 +       mkoctfile $(DEFINES) $< -o $@ ${LAPACK_LIBS} ${BLAS_LIBS}
     27+       $(MKOCTFILE) $(DEFINES) $< -o $@ ${LAPACK_LIBS} ${BLAS_LIBS}
    2628 
    2729 .phony: test
Note: See TracChangeset for help on using the changeset viewer.