diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2020-12-15 12:49:02 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2020-12-15 12:49:02 +0000 |
| commit | c6cf12bb48674fc248006423d81dc0f2df0365e2 (patch) | |
| tree | 611245997c48930eff3497e33080163da4e913ac /dev-cpp | |
| parent | 3e120139ad93526b835ca2a05a3347fdd0367edb (diff) | |
| download | baldeagleos-repo-c6cf12bb48674fc248006423d81dc0f2df0365e2.tar.gz baldeagleos-repo-c6cf12bb48674fc248006423d81dc0f2df0365e2.tar.xz baldeagleos-repo-c6cf12bb48674fc248006423d81dc0f2df0365e2.zip | |
Updating liguros repo
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/eigen/eigen-3.3.9.ebuild | 4 | ||||
| -rw-r--r-- | dev-cpp/eigen/files/eigen-3.3.9-disable-cholmod_support.patch | 20 |
2 files changed, 2 insertions, 22 deletions
diff --git a/dev-cpp/eigen/eigen-3.3.9.ebuild b/dev-cpp/eigen/eigen-3.3.9.ebuild index a16cc66f6e64..b597873bb799 100644 --- a/dev-cpp/eigen/eigen-3.3.9.ebuild +++ b/dev-cpp/eigen/eigen-3.3.9.ebuild @@ -53,8 +53,6 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.3.7-gentoo-cmake.patch "${FILESDIR}"/${PN}-3.3.9-max-macro.patch - # disable the cholmod tests, they always fail - "${FILESDIR}"/${PN}-3.3.9-disable-cholmod_support.patch ) src_prepare() { @@ -79,6 +77,8 @@ src_configure() { use test && mycmakeargs+=( # the OpenGL testsuite is extremely brittle, bug #712808 -DEIGEN_TEST_NO_OPENGL=ON + # the cholmod tests are broken and always fail + -DCMAKE_DISABLE_FIND_PACKAGE_Cholmod=ON -DEIGEN_TEST_CXX11=ON -DEIGEN_TEST_NOQT=ON -DEIGEN_TEST_ALTIVEC=$(usex cpu_flags_ppc_altivec) diff --git a/dev-cpp/eigen/files/eigen-3.3.9-disable-cholmod_support.patch b/dev-cpp/eigen/files/eigen-3.3.9-disable-cholmod_support.patch deleted file mode 100644 index e3b9db5a1707..000000000000 --- a/dev-cpp/eigen/files/eigen-3.3.9-disable-cholmod_support.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -46,16 +46,7 @@ - - set(SPARSE_LIBS " ") - --find_package(Cholmod) --if(CHOLMOD_FOUND) -- add_definitions("-DEIGEN_CHOLMOD_SUPPORT") -- include_directories(${CHOLMOD_INCLUDES}) -- set(SPARSE_LIBS ${SPARSE_LIBS} ${CHOLMOD_LIBRARIES} ${EIGEN_BLAS_LIBRARIES} ${EIGEN_LAPACK_LIBRARIES}) -- set(CHOLMOD_ALL_LIBS ${CHOLMOD_LIBRARIES} ${EIGEN_BLAS_LIBRARIES} ${EIGEN_LAPACK_LIBRARIES}) -- ei_add_property(EIGEN_TESTED_BACKENDS "Cholmod, ") --else() -- ei_add_property(EIGEN_MISSING_BACKENDS "Cholmod, ") --endif() -+ei_add_property(EIGEN_MISSING_BACKENDS "Cholmod, ") - - find_package(Umfpack) - if(UMFPACK_FOUND) |