diff options
| author | Martin Lambers <marlam@marlam.de> | 2012-12-06 12:25:34 (GMT) |
|---|---|---|
| committer | Martin Lambers <marlam@marlam.de> | 2012-12-07 19:32:02 (GMT) |
| commit | bbb8cb14a30f40b484dc99e90f9f4e143c471b35 (patch) | |
| tree | 8c2875ee4b77d895f780e6fa080c06c778e307bd /src | |
| parent | e0ad4a67b2e95fed551cbc5b784a8c3338a94593 (diff) | |
| download | mxe-bbb8cb14a30f40b484dc99e90f9f4e143c471b35.zip mxe-bbb8cb14a30f40b484dc99e90f9f4e143c471b35.tar.gz mxe-bbb8cb14a30f40b484dc99e90f9f4e143c471b35.tar.bz2 | |
Update package eigen.
The update script only found versions 2.x, but 3.x is current.
Diffstat (limited to 'src')
| -rw-r--r-- | src/eigen-1-disable-os-check.patch | 26 | ||||
| -rw-r--r-- | src/eigen.mk | 17 |
2 files changed, 36 insertions, 7 deletions
diff --git a/src/eigen-1-disable-os-check.patch b/src/eigen-1-disable-os-check.patch new file mode 100644 index 0000000..ce9c620 --- /dev/null +++ b/src/eigen-1-disable-os-check.patch @@ -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() diff --git a/src/eigen.mk b/src/eigen.mk index 3a6fc28..19ed6ac 100644 --- a/src/eigen.mk +++ b/src/eigen.mk @@ -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 |