From 7b7c336f32dfced85cc2c0a1c9662bf552697523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 13 Jul 2021 20:42:28 +0200 Subject: [PATCH] Properly set BLA_VENDOR to FlexiBLAS for cmake >= 3.19 --- eigen3.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/eigen3.spec b/eigen3.spec index ce0a853..d73861d 100644 --- a/eigen3.spec +++ b/eigen3.spec @@ -10,10 +10,13 @@ %endif -%if 0%{?fedora} >= 33 +%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 %global blaslib flexiblas +%global cmake_blas_flags -DBLA_VENDOR=FlexiBLAS %else %global blaslib openblas +%global blasvar o +%global cmake_blas_flags -DBLAS_LIBRARIES=%{_libdir}/lib%{blaslib}%{blasvar}.so %endif %if 0%{?rhel} >= 8 @@ -24,7 +27,7 @@ Name: eigen3 Version: 3.3.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A lightweight C++ template library for vector and matrix math License: MPLv2.0 and LGPLv2+ and BSD and Minpack @@ -89,7 +92,7 @@ Developer documentation for Eigen. %build %cmake \ -DINCLUDE_INSTALL_DIR=include/%{name} \ - -DBLAS_LIBRARIES="-l%{blaslib}" \ + %{cmake_blas_flags} \ -DSUPERLU_INCLUDES=%{_includedir}/SuperLU \ -DSCOTCH_INCLUDES=%{_includedir} -DSCOTCH_LIBRARIES="scotch" \ -DMETIS_INCLUDES=%{_includedir} -DMETIS_LIBRARIES="metis" \ @@ -124,6 +127,9 @@ rm -f %{_vpath_builddir}/doc/html/unsupported/installdox %changelog +* Tue Jul 13 2021 Björn Esser - 3.3.9-6 +- Properly set BLA_VENDOR to FlexiBLAS for cmake >= 3.19 + * Wed Jun 02 2021 Jiri Kucera - 3.3.9-5 - Add missing Minpack license Resolves: #1965214