#2 Additional fixes to enable FlexiBLAS instead of LAPACK
Merged 2 years ago by jdieter. Opened 2 years ago by iucar.
rpms/ iucar/naev rawhide  into  rawhide

file modified
+8 -2
@@ -1,6 +1,6 @@ 

  Name:           naev

  Version:        0.9.0

- Release:        4%{?dist}

+ Release:        5%{?dist}

  Summary:        2d action, RPG space game

  License:        GPLv3

  URL:            http://naev.org
@@ -31,7 +31,6 @@ 

  BuildRequires:  physfs-devel

  BuildRequires:  libwebp-devel

  BuildRequires:  glpk-devel

- BuildRequires:  lapack-devel

  BuildRequires:  metis-devel

  BuildRequires:  flexiblas-devel

  BuildRequires:  luajit-devel
@@ -60,6 +59,10 @@ 

  rm -rf subprojects/packagefiles

  # Patch meson.build for Fedora compat-lua

  sed -i 's/lua51/lua-5.1/g' meson.build

+ # Location of cblas.h

+ for file in meson.build src/safelanes.c; do

+   sed -i 's|<cblas.h>|<flexiblas/cblas.h>|' $file

+ done

  

  

  %build
@@ -89,6 +92,9 @@ 

  

  

  %changelog

+ * Tue Jan 18 2022 Iñaki Úcar <iucar@fedoraproject.org> - 0.9.0-5

+ - Additional fixes to enable FlexiBLAS instead of LAPACK

+ 

  * Mon Jan 17 2022 Iñaki Úcar <iucar@fedoraproject.org> - 0.9.0-4

  - https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager

  

Apologies for the previous incomplete PR. I assumed that upstream was properly picking the BLAS library, and it's not.

This PR removes LAPACK from BuildRequires (it is not required, but anyway FlexiBLAS provides LAPACK) and fixes the include for cblas.h. Ideally, upstream should provide an option to set the proper includedir for BLAS instead of what they do in src/safelanes.c, but ¯_(ツ)_/¯. Tested in F34 and F35 too.

Pull-Request has been merged by jdieter

2 years ago

Ok, that's built for F34, F35 and Rawhide. Thanks so much!

Metadata