eigen, revbump, disable extra libraries (#13212)

This commit is contained in:
Schrijvers Luc
2025-11-13 15:38:41 +01:00
committed by GitHub
parent a27e9619fd
commit a9d7798504
2 changed files with 4 additions and 50 deletions

View File

@@ -31,7 +31,7 @@ LICENSE="MPL v2
BSD (3-clause)
GNU GPL v3
GNU LGPL v2.1"
REVISION="2"
REVISION="3"
SOURCE_URI="http://gitlab.com/libeigen/eigen/-/archive/$portVersion/eigen-$portVersion.tar.gz"
CHECKSUM_SHA256="e9c326dc8c05cd1e044c71f30f1b2e34a6161a3b6ecf445d56b53ff1669e3dec"
PATCHES="eigen-$portVersion.patchset"
@@ -42,10 +42,6 @@ SECONDARY_ARCHITECTURES="x86"
PROVIDES="
eigen$secondaryArchSuffix = $portVersion
devel:eigen$secondaryArchSuffix = $portVersion
lib:libeigen_blas$secondaryArchSuffix
lib:libeigen_lapack$secondaryArchSuffix
devel:libeigen_blas_static$secondaryArchSuffix
devel:libeigen_lapack_static$secondaryArchSuffix
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -87,6 +83,8 @@ BUILD()
-DINCLUDE_INSTALL_DIR=$includeDir \
-DCMAKEPACKAGE_INSTALL_DIR=$libDir/cmake/eigen3 \
-DPKGCONFIG_INSTALL_DIR=$developLibDir/pkgconfig \
-DEIGEN_BUILD_BLAS=OFF \
-DEIGEN_BUILD_LAPACK=OFF \
-Wno-dev
make -C build $jobArgs
@@ -95,10 +93,6 @@ BUILD()
INSTALL()
{
make -C build install
prepareInstalledDevelLibs \
libeigen_blas_static \
libeigen_lapack_static
}
TEST()

View File

@@ -1,4 +1,4 @@
From d3135623cada80c2fa6f2b3628db1456431bb16b Mon Sep 17 00:00:00 2001
From c748140f06643a776e68b7f4a804a00542435212 Mon Sep 17 00:00:00 2001
From: Calvin Hill <calvin@hakobaito.co.uk>
Date: Mon, 1 May 2017 04:17:23 +0100
Subject: Eigen patch to run tests for Haiku
@@ -28,43 +28,3 @@ index 15d7fb2..1f456ad 100644
--
2.51.0
From ecf5e965965b98354480ab9aa1e98fff8aa0ef15 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Thu, 13 Nov 2025 12:46:20 +0100
Subject: Fix library installation path
diff --git a/blas/CMakeLists.txt b/blas/CMakeLists.txt
index 45488d7..659eb9c 100644
--- a/blas/CMakeLists.txt
+++ b/blas/CMakeLists.txt
@@ -33,8 +33,8 @@ foreach(target IN LISTS EIGEN_BLAS_TARGETS)
add_dependencies(blas ${target})
install(TARGETS ${target}
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib)
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
endforeach()
if(EIGEN_BUILD_TESTING)
diff --git a/lapack/CMakeLists.txt b/lapack/CMakeLists.txt
index d837fff..6dd0884 100644
--- a/lapack/CMakeLists.txt
+++ b/lapack/CMakeLists.txt
@@ -122,8 +122,8 @@ foreach(target IN LISTS EIGEN_LAPACK_TARGETS)
add_dependencies(lapack ${target})
install(TARGETS ${target}
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib)
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
endforeach()
--
2.51.0