From 85198f93fba5f49289cea9808b6dd1f7eea000cf Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 21 Oct 2020 10:48:33 +0200 Subject: [PATCH] Use pkg-config for getting blas and lapack directories This fixes the build when flexiblas prefix doesn't match blas/lapack prefix, which can happen when building flatpak modules. In that case, blas/lapack might be installed in /usr and flexiblas in /app. --- flexiblas.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/flexiblas.spec b/flexiblas.spec index d23d74b..798545c 100644 --- a/flexiblas.spec +++ b/flexiblas.spec @@ -16,7 +16,7 @@ Name: flexiblas Version: %{major_version}.%{minor_version}.%{patch_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A BLAS/LAPACK wrapper library with runtime exchangeable backends # GPLv3 with an exception for the BLAS/LAPACK interface @@ -213,8 +213,8 @@ rm -rf contributed %cmake -B build \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ %if %{with system_lapack} - -DSYS_BLAS_LIBRARY=%{_libdir}/libblas.a \ - -DSYS_LAPACK_LIBRARY=%{_libdir}/liblapack_pic.a \ + -DSYS_BLAS_LIBRARY=$(pkg-config --variable=libdir blas)/libblas.a \ + -DSYS_LAPACK_LIBRARY=$(pkg-config --variable=libdir lapack)/liblapack_pic.a \ %endif -DINTEGER8=OFF \ -DTESTS=ON @@ -223,8 +223,8 @@ rm -rf contributed %cmake -B build64 \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ %if %{with system_lapack} - -DSYS_BLAS_LIBRARY=%{_libdir}/libblas64.a \ - -DSYS_LAPACK_LIBRARY=%{_libdir}/liblapack_pic64.a \ + -DSYS_BLAS_LIBRARY=$(pkg-config --variable=libdir blas)/libblas64.a \ + -DSYS_LAPACK_LIBRARY=$(pkg-config --variable=libdir lapack)/liblapack_pic64.a \ %endif -DINTEGER8=ON \ -DTESTS=ON @@ -395,6 +395,9 @@ make -C build64 test %endif %changelog +* Wed Oct 21 2020 Kalev Lember - 3.0.3-2 +- Use pkg-config for getting blas and lapack directories + * Fri Aug 28 2020 Iñaki Úcar - 3.0.3-1 - Update to 3.0.3, fixes ScaLAPACK issues