diff options
author | Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> | 2015-10-23 08:01:15 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-26 21:37:37 +0100 |
commit | 5b8bd1633263bf9a346453f50fde7d78690d1996 (patch) | |
tree | ad8f68d4aeca0a1f01e98485580d12a14067f40e /meta-oe/recipes-support | |
parent | 9dbf3c5b024bbdef1aa3ecbe41f646703ed372dc (diff) | |
download | meta-openembedded-contrib-5b8bd1633263bf9a346453f50fde7d78690d1996.tar.gz |
libeigen: update to 3.2.6
It seems that the libeigen patch is not required anymore. I could
not find any issue while building libeigen and other recipes
depending on libeigen.
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r-- | meta-oe/recipes-support/libeigen/libeigen/eigen-disable-tests.patch | 75 | ||||
-rw-r--r-- | meta-oe/recipes-support/libeigen/libeigen_3.2.6.bb (renamed from meta-oe/recipes-support/libeigen/libeigen_3.2.0.bb) | 9 |
2 files changed, 4 insertions, 80 deletions
diff --git a/meta-oe/recipes-support/libeigen/libeigen/eigen-disable-tests.patch b/meta-oe/recipes-support/libeigen/libeigen/eigen-disable-tests.patch deleted file mode 100644 index b3dddbeaf8..0000000000 --- a/meta-oe/recipes-support/libeigen/libeigen/eigen-disable-tests.patch +++ /dev/null @@ -1,75 +0,0 @@ -libeigen: don't try building tests - -While configuring, if the tests are enabled, it checks some machine-specific -settings which we don't want to do while cross-compiling. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> - ---- a/CMakeLists.txt~ 2013-07-29 16:59:48.403504947 -0400 -+++ b/CMakeLists.txt 2013-07-29 17:00:19.868020948 -0400 -@@ -346,25 +346,25 @@ - - add_subdirectory(doc EXCLUDE_FROM_ALL) - --include(EigenConfigureTesting) -+#include(EigenConfigureTesting) - - # fixme, not sure this line is still needed: --enable_testing() # must be called from the root CMakeLists, see man page -+#enable_testing() # must be called from the root CMakeLists, see man page - - --if(EIGEN_LEAVE_TEST_IN_ALL_TARGET) -- add_subdirectory(test) # can't do EXCLUDE_FROM_ALL here, breaks CTest --else() -- add_subdirectory(test EXCLUDE_FROM_ALL) --endif() -+#if(EIGEN_LEAVE_TEST_IN_ALL_TARGET) -+# add_subdirectory(test) # can't do EXCLUDE_FROM_ALL here, breaks CTest -+#else() -+# add_subdirectory(test EXCLUDE_FROM_ALL) -+#endif() - --if(EIGEN_LEAVE_TEST_IN_ALL_TARGET) -- add_subdirectory(blas) -- add_subdirectory(lapack) --else() -- add_subdirectory(blas EXCLUDE_FROM_ALL) -- add_subdirectory(lapack EXCLUDE_FROM_ALL) --endif() -+#if(EIGEN_LEAVE_TEST_IN_ALL_TARGET) -+# add_subdirectory(blas) -+# add_subdirectory(lapack) -+#else() -+# add_subdirectory(blas EXCLUDE_FROM_ALL) -+# add_subdirectory(lapack EXCLUDE_FROM_ALL) -+#endif() - - add_subdirectory(unsupported) - -@@ -384,7 +384,7 @@ - - configure_file(scripts/cdashtesting.cmake.in cdashtesting.cmake @ONLY) - --ei_testing_print_summary() -+#ei_testing_print_summary() - - message(STATUS "") - message(STATUS "Configured Eigen ${EIGEN_VERSION_NUMBER}") ---- a/unsupported/CMakeLists.txt~ 2013-07-29 16:59:54.091598607 -0400 -+++ b/unsupported/CMakeLists.txt 2013-07-29 17:00:27.052139300 -0400 -@@ -1,7 +1,7 @@ - add_subdirectory(Eigen) - add_subdirectory(doc EXCLUDE_FROM_ALL) --if(EIGEN_LEAVE_TEST_IN_ALL_TARGET) -- add_subdirectory(test) # can't do EXCLUDE_FROM_ALL here, breaks CTest --else() -- add_subdirectory(test EXCLUDE_FROM_ALL) --endif() -+#if(EIGEN_LEAVE_TEST_IN_ALL_TARGET) -+# add_subdirectory(test) # can't do EXCLUDE_FROM_ALL here, breaks CTest -+#else() -+# add_subdirectory(test EXCLUDE_FROM_ALL) -+#endif() diff --git a/meta-oe/recipes-support/libeigen/libeigen_3.2.0.bb b/meta-oe/recipes-support/libeigen/libeigen_3.2.6.bb index de5186f10c..4d73597567 100644 --- a/meta-oe/recipes-support/libeigen/libeigen_3.2.0.bb +++ b/meta-oe/recipes-support/libeigen/libeigen_3.2.6.bb @@ -4,12 +4,11 @@ HOMEPAGE = "http://eigen.tuxfamily.org/" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad" -SRC_URI = "http://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 \ - file://eigen-disable-tests.patch" -SRC_URI[md5sum] = "894381be5be65bb7099c6fd91d61b357" -SRC_URI[sha256sum] = "011f78960d939227f9276173d0c4cc0053bb9e0a7356539a9a6c7c89d984fab6" +SRC_URI = "http://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2" +SRC_URI[md5sum] = "87274966745d2d3e7964fcc654d0a24b" +SRC_URI[sha256sum] = "8a3352f9a5361fe90e451a7305fb1896fc7f771dc16cc0edd8e6b157f52c343e" -S = "${WORKDIR}/eigen-eigen-ffa86ffb5570" +S = "${WORKDIR}/eigen-eigen-c58038c56923" inherit cmake |