summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2016-11-11 16:41:59 +0100
committerAvatar Heiko Becker <heirecka@exherbo.org> 2016-11-11 16:43:33 +0100
commit0b5b842922d4f9edd9a00ecdfe9cebfd2ca0b5bf (patch)
tree1cf67cca31060a2346c039080852a90921af23e4
parent77e6c08d393f1c5c97918d9148740f49fa71f76a (diff)
downloadscientific-0b5b842922d4f9edd9a00ecdfe9cebfd2ca0b5bf.tar.gz
scientific-0b5b842922d4f9edd9a00ecdfe9cebfd2ca0b5bf.tar.xz
eigen: Drop old SLOT
Playboy says nothing depends on it anymore. Change-Id: Ic869326c56dac5c6f475b6d2b1abdefe3b6093b6
-rw-r--r--packages/sci-libs/eigen/eigen-2.0.17-r1.exheres-021
-rw-r--r--packages/sci-libs/eigen/eigen.exlib44
-rw-r--r--packages/sci-libs/eigen/files/eigen2-Fix-.pc-paths-for-multiarch.patch25
3 files changed, 16 insertions, 74 deletions
diff --git a/packages/sci-libs/eigen/eigen-2.0.17-r1.exheres-0 b/packages/sci-libs/eigen/eigen-2.0.17-r1.exheres-0
deleted file mode 100644
index 849a8d9..0000000
--- a/packages/sci-libs/eigen/eigen-2.0.17-r1.exheres-0
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2008, 2009, 2014 Ingmar Vanhassel <ingmar@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require eigen
-
-SLOT="2"
-
-PLATFORMS="~amd64 ~x86"
-
-DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/eigen2-Fix-.pc-paths-for-multiarch.patch )
-
-src_prepare() {
- cmake_src_prepare
-
- # Disable two failing tests. They used to pass with older gcc versions,
- # but as eigen:2 isn't released anymore I see little point in fixing them.
- edo sed -e "/^ei_add_test(unalignedassert)/d" \
- -e "/^ei_add_test(hyperplane)/d" \
- -i "${CMAKE_SOURCE}"/test/CMakeLists.txt
-}
-
diff --git a/packages/sci-libs/eigen/eigen.exlib b/packages/sci-libs/eigen/eigen.exlib
index 530c132..46e9df3 100644
--- a/packages/sci-libs/eigen/eigen.exlib
+++ b/packages/sci-libs/eigen/eigen.exlib
@@ -34,6 +34,8 @@ MYOPTIONS="
DEPENDENCIES="
build:
sparse? ( sci-libs/SuiteSparse )
+ test:
+ sci-libs/fftw
"
CMAKE_SRC_CONFIGURE_PARAMS=(
@@ -49,24 +51,14 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
-DEIGEN_TEST_NO_FORTRAN:BOOL=TRUE
)
-if ever at_least 3.2.5 ; then
- DEPENDENCIES+="
- test:
- sci-libs/fftw
- "
- CMAKE_SRC_CONFIGURE_PARAMS+=(
- -DCMAKE_BUILD_TYPE:STRING=release
- -DBUILD_TESTING:BOOL=TRUE
- -DEIGEN_SPLIT_LARGE_TESTS:BOOL=TRUE
- -DEIGEN_TEST_NO_OPENGL:BOOL=TRUE
- )
-fi
-
-if [[ ${SLOT} == 2 ]] ; then
- MY_HGREV="b23437e61a07"
-else
- MY_HGREV="b30b87236a1b"
-fi
+CMAKE_SRC_CONFIGURE_PARAMS+=(
+ -DCMAKE_BUILD_TYPE:STRING=release
+ -DBUILD_TESTING:BOOL=TRUE
+ -DEIGEN_SPLIT_LARGE_TESTS:BOOL=TRUE
+ -DEIGEN_TEST_NO_OPENGL:BOOL=TRUE
+)
+
+MY_HGREV="b30b87236a1b"
CMAKE_SOURCE=${WORKBASE}/${PN}-${PN}-${MY_HGREV}
eigen_src_configure() {
@@ -78,18 +70,14 @@ eigen_src_configure() {
eigen_src_install() {
cmake_src_install
- if ever at_least 3.2.5 ; then
- insinto /usr/share/cmake/Modules
- doins "${CMAKE_SOURCE}"/cmake/FindEigen3.cmake
+ insinto /usr/share/cmake/Modules
+ doins "${CMAKE_SOURCE}"/cmake/FindEigen3.cmake
- edo rm -r "${IMAGE}"/usr/share/doc
- fi
+ edo rm -r "${IMAGE}"/usr/share/doc
# TODO: report upstream, fix pkgconfig file
- if ever at_least 3.2.7 ; then
- edo sed \
- -e "s:-Iinclude:-I/usr/$(exhost --target)/include:g" \
- -i "${IMAGE}"/usr/$(exhost --target)/lib/pkgconfig/eigen3.pc
- fi
+ edo sed \
+ -e "s:-Iinclude:-I/usr/$(exhost --target)/include:g" \
+ -i "${IMAGE}"/usr/$(exhost --target)/lib/pkgconfig/eigen3.pc
}
diff --git a/packages/sci-libs/eigen/files/eigen2-Fix-.pc-paths-for-multiarch.patch b/packages/sci-libs/eigen/files/eigen2-Fix-.pc-paths-for-multiarch.patch
deleted file mode 100644
index dac6c19..0000000
--- a/packages/sci-libs/eigen/files/eigen2-Fix-.pc-paths-for-multiarch.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 589fba02acec691ca2f9acd0812d168e647839ca Mon Sep 17 00:00:00 2001
-From: Ingmar Vanhassel <ingmar@exherbo.org>
-Date: Sat, 2 May 2015 15:26:02 +0200
-Subject: [PATCH] Fix .pc paths for multiarch
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bb12a7c..22d4b35 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -120,7 +120,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
- if(EIGEN_BUILD_PKGCONFIG)
- configure_file(eigen2.pc.in eigen2.pc) # uses INCLUDE_INSTALL_DIR
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen2.pc
-- DESTINATION share/pkgconfig
-+ DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig
- )
- endif(EIGEN_BUILD_PKGCONFIG)
-
---
-2.3.3
-