diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/armadillo-1-staticlib.patch | 19 | ||||
| -rw-r--r-- | src/armadillo.mk | 4 |
2 files changed, 11 insertions, 12 deletions
diff --git a/src/armadillo-1-staticlib.patch b/src/armadillo-1-staticlib.patch index 3cb919a..a643985 100644 --- a/src/armadillo-1-staticlib.patch +++ b/src/armadillo-1-staticlib.patch @@ -2,8 +2,8 @@ This file is part of MXE. See index.html for further information. diff -urN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2013-04-26 08:48:11.000000000 +0200 -+++ b/CMakeLists.txt 2013-04-27 18:49:46.454530270 +0200 +--- a/CMakeLists.txt 2013-12-06 08:39:40.000000000 +0100 ++++ b/CMakeLists.txt 2013-12-06 14:05:54.098314032 +0100 @@ -32,7 +32,7 @@ set(ARMA_USE_ATLAS false) set(ARMA_USE_BOOST false) @@ -11,14 +11,13 @@ diff -urN a/CMakeLists.txt b/CMakeLists.txt -set(ARMA_USE_WRAPPER true ) +set(ARMA_USE_WRAPPER false) - # NOTE: - # Set ARMA_USE_WRAPPER to false if you're getting linking errors when compiling your programs, -@@ -320,7 +320,7 @@ - message(STATUS "CMAKE_SHARED_LINKER_FLAGS = ${CMAKE_SHARED_LINKER_FLAGS}") - endif() + ## NOTE: + ## Set ARMA_USE_WRAPPER to false if you're getting linking errors when compiling your programs, +@@ -340,7 +340,7 @@ + message(STATUS "CMAKE_SHARED_LINKER_FLAGS = ${CMAKE_SHARED_LINKER_FLAGS}") --add_library( armadillo SHARED src/wrap_libs ) -+add_library( armadillo STATIC src/wrap_libs ) + +-add_library( armadillo SHARED src/wrapper ) ++add_library( armadillo STATIC src/wrapper ) target_link_libraries( armadillo ${ARMA_LIBS} ) set_target_properties(armadillo PROPERTIES VERSION ${ARMA_MAJOR}.${ARMA_MINOR_ALT}.${ARMA_PATCH} SOVERSION ${ARMA_MAJOR}) - diff --git a/src/armadillo.mk b/src/armadillo.mk index 023d629..637f7e5 100644 --- a/src/armadillo.mk +++ b/src/armadillo.mk @@ -3,8 +3,8 @@ PKG := armadillo $(PKG)_IGNORE := -$(PKG)_VERSION := 3.920.4 -$(PKG)_CHECKSUM := bfa0e96c207dc69fedb405602a28c718c4e9e16e +$(PKG)_VERSION := 3.930.0 +$(PKG)_CHECKSUM := 3952fde76b9479ee22d1b4549eaa5939ced8d946 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/arma/$($(PKG)_FILE) |