Update package eigen.

The update script only found versions 2.x, but 3.x is current.
This commit is contained in:
Martin Lambers 2012-12-06 13:25:34 +01:00
parent e0ad4a67b2
commit bbb8cb14a3
3 changed files with 37 additions and 8 deletions

View File

@ -1025,7 +1025,7 @@ USE_OSGPLUGIN(<plugin2>)
</tr>
<tr>
<td id="eigen-package">eigen</td>
<td id="eigen-version">2.0.17</td>
<td id="eigen-version">3.1.2</td>
<td id="eigen-website"><a href="http://eigen.tuxfamily.org/">eigen</a></td>
</tr>
<tr>

View File

@ -0,0 +1,26 @@
This file is part of MXE.
See index.html for further information.
--- a/cmake/EigenDetermineOSVersion.cmake 2012-12-05 16:53:46.305932163 +0100
+++ b/cmake/EigenDetermineOSVersion.cmake 2012-12-05 16:56:15.937936644 +0100
@@ -27,19 +27,7 @@
function(DetermineOSVersion OS_VERSION)
if (WIN32)
- file (TO_NATIVE_PATH "$ENV{COMSPEC}" SHELL)
- exec_program( ${SHELL} ARGS "/c" "ver" OUTPUT_VARIABLE ver_output)
-
- string(REGEX MATCHALL "[0-9]+"
- ver_list "${ver_output}")
- list(GET ver_list 0 _major)
- list(GET ver_list 1 _minor)
-
- set(win_num_version ${_major}.${_minor})
- DetermineShortWindowsName(win_version "${win_num_version}")
- if(win_version)
- set(${OS_VERSION} ${win_version} PARENT_SCOPE)
- endif()
+ set(${OS_VERSION} "unknownWin" PARENT_SCOPE)
else()
set(${OS_VERSION} ${CMAKE_SYSTEM} PARENT_SCOPE)
endif()

View File

@ -3,21 +3,24 @@
PKG := eigen
$(PKG)_IGNORE :=
$(PKG)_CHECKSUM := 7e1674420a8eef7e90e1875ef5b9e828fb9db381
$(PKG)_SUBDIR := $(PKG)-$(PKG)-b23437e61a07
$(PKG)_FILE := $($(PKG)_VERSION).tar.gz
$(PKG)_CHECKSUM := b788877a4d4b1685ee2a5d738a65b04b6a21ff3d
$(PKG)_SUBDIR := $(PKG)-$(PKG)-5097c01bcdc4
$(PKG)_FILE := $($(PKG)_VERSION).tar.bz2
$(PKG)_URL := https://bitbucket.org/$(PKG)/$(PKG)/get/$($(PKG)_FILE)
$(PKG)_DEPS := gcc
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://eigen.tuxfamily.org/index.php?title=Main_Page#Download' | \
grep 'eigen/get/' | \
$(SED) -n 's,.*eigen/get/\(2[^>]*\)\.tar.*,\1,p' | \
$(SED) -n 's,.*eigen/get/\(3[^>]*\)\.tar.*,\1,p' | \
head -1
endef
define $(PKG)_BUILD
cd '$(1)' && \
cmake . -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'
$(MAKE) -C '$(1)' -j '$(JOBS)' install
cd '$(1)' && mkdir build && cd build && cmake .. \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-DCMAKE_BUILD_TYPE=Release \
-DEIGEN_BUILD_PKGCONFIG=ON \
-Drun_res=1 -Drun_res__TRYRUN_OUTPUT=""
$(MAKE) -C '$(1)'/build -j '$(JOBS)' install VERBOSE=1
endef