From d10ca6f974bba633221a5c054282d6a93b66c59b Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 25 Mar 2013 10:21:50 +0100 Subject: update package armadillo --- index.html | 2 +- src/armadillo-1-staticlib.patch | 8 ++++---- src/armadillo.mk | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index 0019c5e..d3104f9 100644 --- a/index.html +++ b/index.html @@ -960,7 +960,7 @@ aptitude -t squeeze-backports install cmake yasm armadillo - 3.800.1 + 3.800.2 Armadillo C++ linear algebra library diff --git a/src/armadillo-1-staticlib.patch b/src/armadillo-1-staticlib.patch index 64a1095..5b9c56e 100644 --- a/src/armadillo-1-staticlib.patch +++ b/src/armadillo-1-staticlib.patch @@ -13,12 +13,12 @@ diff -urN a/CMakeLists.txt b/CMakeLists.txt if(WIN32) -@@ -268,7 +268,7 @@ - #set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - +@@ -279,7 +279,7 @@ + set(ARMA_MINOR_ALT ${ARMA_MINOR}) + endif() -add_library( armadillo SHARED src/wrap_libs ) +add_library( armadillo STATIC src/wrap_libs ) target_link_libraries( armadillo ${ARMA_LIBS} ) + set_target_properties(armadillo PROPERTIES VERSION ${ARMA_MAJOR}.${ARMA_MINOR_ALT}.${ARMA_PATCH} SOVERSION ${ARMA_MAJOR}) - set_target_properties(armadillo PROPERTIES VERSION ${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH} SOVERSION 3) diff --git a/src/armadillo.mk b/src/armadillo.mk index 51b60bf..5db2480 100644 --- a/src/armadillo.mk +++ b/src/armadillo.mk @@ -4,7 +4,7 @@ # armadillo PKG := armadillo $(PKG)_IGNORE := -$(PKG)_CHECKSUM := aa17ba585beff8759098b047af8acbb90cc8a8b1 +$(PKG)_CHECKSUM := 9e2b33574ff577b1870dc8fdfff7d4ec88648576 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/arma/$($(PKG)_FILE) -- cgit v0.12