Mercurial > mxe-octave
changeset 2773:603f5be8a550
update package armadillo
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Thu, 20 Sep 2012 20:43:27 +0200 |
| parents | 07832042b06a |
| children | 0f825b9c0d8c 8e8546a738b5 |
| files | index.html src/armadillo-1-staticlib.patch src/armadillo.mk |
| diffstat | 3 files changed, 7 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/index.html Thu Sep 20 20:17:44 2012 +0200 +++ b/index.html Thu Sep 20 20:43:27 2012 +0200 @@ -925,7 +925,7 @@ </tr> <tr> <td id="armadillo-package">armadillo</td> - <td id="armadillo-version">3.4.0</td> + <td id="armadillo-version">3.4.1</td> <td id="armadillo-website"><a href="http://armadillo.sf.net/">Armadillo C++ linear algebra library</a></td> </tr> <tr>
--- a/src/armadillo-1-staticlib.patch Thu Sep 20 20:17:44 2012 +0200 +++ b/src/armadillo-1-staticlib.patch Thu Sep 20 20:43:27 2012 +0200 @@ -1,37 +1,18 @@ This file is part of MXE. See index.html for further information. ---- armadillo-3.4.0/CMakeLists.txt.orig 2012-09-06 09:43:16.000000000 +0200 -+++ armadillo-3.4.0/CMakeLists.txt 2012-09-09 16:18:57.000000000 +0200 +diff -urN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2012-09-14 16:43:20.000000000 +0200 ++++ b/CMakeLists.txt 2012-09-20 20:39:05.073039124 +0200 @@ -40,7 +40,7 @@ set(ARMA_USE_ATLAS false) set(ARMA_USE_BOOST false) set(ARMA_USE_HDF5 false) --set(ARMA_USE_WRAPPER true ) -+set(ARMA_USE_WRAPPER false) +-set(ARMA_USE_WRAPPER true ) # set this to false if you prefer to directly link with LAPACK and/or BLAS (eg. -llapack -lblas) instead of -larmadillo ++set(ARMA_USE_WRAPPER false ) # set this to false if you prefer to directly link with LAPACK and/or BLAS (eg. -llapack -lblas) instead of -larmadillo if(WIN32) -@@ -158,15 +158,15 @@ - endif() - - else() -+ -+ if(ARMA_USE_LAPACK STREQUAL true) -+ set(ARMA_LIBS ${ARMA_LIBS} ${LAPACK_LIBRARIES}) -+ endif() - - if(ARMA_USE_BLAS STREQUAL true) - set(ARMA_LIBS ${ARMA_LIBS} ${BLAS_LIBRARIES}) - endif() - -- if(ARMA_USE_LAPACK STREQUAL true) -- set(ARMA_LIBS ${ARMA_LIBS} ${LAPACK_LIBRARIES}) -- endif() -- - if(ARMA_USE_ATLAS STREQUAL true) - set(ARMA_LIBS ${ARMA_LIBS} ${CBLAS_LIBRARIES}) - set(ARMA_LIBS ${ARMA_LIBS} ${CLAPACK_LIBRARIES}) @@ -263,7 +263,7 @@ #set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
--- a/src/armadillo.mk Thu Sep 20 20:17:44 2012 +0200 +++ b/src/armadillo.mk Thu Sep 20 20:43:27 2012 +0200 @@ -4,7 +4,7 @@ # armadillo PKG := armadillo $(PKG)_IGNORE := -$(PKG)_CHECKSUM := e7fdb6518172aabaa28c84412b52db7d86ef37a5 +$(PKG)_CHECKSUM := 16f11ee6e7a545581ab239e7f826e14d7d1c2e3a $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/arma/$($(PKG)_FILE)