diff options
| author | Tony Theodore <tonyt@logyst.com> | 2013-03-25 17:58:51 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-03-25 17:58:51 (GMT) |
| commit | 76c3a911500aab63bdb8d4c8df6f025952bdd725 (patch) | |
| tree | 86cf670cb2eef2c783abf3da66c54dd67038cb86 | |
| parent | 8bb54344309241ec4f0e11ce886f903bc723c3cb (diff) | |
| parent | d10ca6f974bba633221a5c054282d6a93b66c59b (diff) | |
| download | mxe-76c3a911500aab63bdb8d4c8df6f025952bdd725.zip mxe-76c3a911500aab63bdb8d4c8df6f025952bdd725.tar.gz mxe-76c3a911500aab63bdb8d4c8df6f025952bdd725.tar.bz2 | |
Merge branch 'master' of github.com:mxe/mxe
| -rw-r--r-- | index.html | 2 | ||||
| -rw-r--r-- | src/armadillo-1-staticlib.patch | 8 | ||||
| -rw-r--r-- | src/armadillo.mk | 2 |
3 files changed, 6 insertions, 6 deletions
@@ -960,7 +960,7 @@ aptitude -t squeeze-backports install cmake yasm</pre> </tr> <tr> <td id="armadillo-package">armadillo</td> - <td id="armadillo-version">3.800.1</td> + <td id="armadillo-version">3.800.2</td> <td id="armadillo-website"><a href="http://armadillo.sf.net/">Armadillo C++ linear algebra library</a></td> </tr> <tr> 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) |