diff options
| author | Niels Kristian Bech Jensen <nkbj1970@hotmail.com> | 2013-04-28 05:21:47 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-04-28 05:21:47 (GMT) |
| commit | 3fcfb860a6d5d3f01859496c8562c3ee41e97f3c (patch) | |
| tree | 735c18a1f657e9fc63cab84ac5fd74eca63c7777 /src | |
| parent | 5e4a57a4e8921ff0a374756f5340d1234f8d66d4 (diff) | |
| download | mxe-3fcfb860a6d5d3f01859496c8562c3ee41e97f3c.zip mxe-3fcfb860a6d5d3f01859496c8562c3ee41e97f3c.tar.gz mxe-3fcfb860a6d5d3f01859496c8562c3ee41e97f3c.tar.bz2 | |
update package armadillo
Diffstat (limited to 'src')
| -rw-r--r-- | src/armadillo-1-staticlib.patch | 18 | ||||
| -rw-r--r-- | src/armadillo.mk | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/armadillo-1-staticlib.patch b/src/armadillo-1-staticlib.patch index 5b9c56e..19f8b4d 100644 --- a/src/armadillo-1-staticlib.patch +++ b/src/armadillo-1-staticlib.patch @@ -2,19 +2,19 @@ This file is part of MXE. See index.html for further information. 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 -@@ -37,7 +37,7 @@ +--- a/CMakeLists.txt 2013-04-26 08:48:11.000000000 +0200 ++++ b/CMakeLists.txt 2013-04-27 18:49:46.454530270 +0200 +@@ -32,7 +32,7 @@ set(ARMA_USE_ATLAS false) set(ARMA_USE_BOOST false) set(ARMA_USE_HDF5 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 +-set(ARMA_USE_WRAPPER true ) ++set(ARMA_USE_WRAPPER false) - - if(WIN32) -@@ -279,7 +279,7 @@ - set(ARMA_MINOR_ALT ${ARMA_MINOR}) + # NOTE: + # Set ARMA_USE_WRAPPER to false if you're getting linking errors when compiling your programs, +@@ -289,7 +289,7 @@ + message(STATUS "CMAKE_SHARED_LINKER_FLAGS = ${CMAKE_SHARED_LINKER_FLAGS}") endif() -add_library( armadillo SHARED src/wrap_libs ) diff --git a/src/armadillo.mk b/src/armadillo.mk index 6fb2c45..1baccb9 100644 --- a/src/armadillo.mk +++ b/src/armadillo.mk @@ -4,7 +4,7 @@ # armadillo PKG := armadillo $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 9e2b33574ff577b1870dc8fdfff7d4ec88648576 +$(PKG)_CHECKSUM := 0b410d07b8d5ec2c4a75722166901e462c0664b2 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/arma/$($(PKG)_FILE) |