From 79a8ad31e3f2f1628c3753d020c5b691364d10a9 Mon Sep 17 00:00:00 2001 From: Iñaki Úcar Date: Jul 25 2020 11:26:02 +0000 Subject: https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager --- diff --git a/COPASI.spec b/COPASI.spec index b38cad1..29dfbda 100644 --- a/COPASI.spec +++ b/COPASI.spec @@ -25,7 +25,7 @@ Name: COPASI Summary: Biochemical network simulator Version: 4.28.%{buildid} -Release: 2%{?dist} +Release: 3%{?dist} ##Artistic 2.0 is main license ##GPLv2+ is related to a Mixed Source Licensing Scenario @@ -63,7 +63,7 @@ BuildRequires: cppunit-devel BuildRequires: libcurl-devel BuildRequires: libxslt-devel BuildRequires: pkgconf-pkg-config -BuildRequires: openblas-devel, openblas-srpm-macros, lapack-devel +BuildRequires: pkgconfig(flexiblas) BuildRequires: crossguid2-devel >= 0:0.2.2 # Needed until https://bugzilla.redhat.com/show_bug.cgi?id=1721342 is resolved BuildRequires: libuuid-devel @@ -283,10 +283,9 @@ sed -i.bak '/double pow_dd(doublereal *,/d' copasi/odepack++/CRadau5.cpp sed -i.bak '/C_FLOAT64 d_lg10(C_FLOAT64 *);/d' copasi/optimization/CPraxis.cpp %build -mkdir -p build && pushd build -export CXXFLAGS="-I$PWD/../copasi/lapack -I$PWD/../copasi/CopasiSBW -DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} %{__global_ldflags}" +export CXXFLAGS="-I$PWD/copasi/lapack -I$PWD/copasi/CopasiSBW -DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} %{__global_ldflags}" export LDFLAGS="%{__global_ldflags} -lbz2" -%cmake \ +%cmake -B build \ -DCOPASI_OVERRIDE_VERSION:STRING=%{version} \ %if 0%{?with_python} -DENABLE_PYTHON:BOOL=ON \ @@ -336,8 +335,8 @@ export LDFLAGS="%{__global_ldflags} -lbz2" -DENABLE_SBW_INTEGRATION=ON -DBUILD_CXX_EXAMPLES=OFF \ -DENABLE_COPASI_BANDED_GRAPH:BOOL=ON -DENABLE_COPASI_SEDML:BOOL=ON \ -DENABLE_COPASI_NONLIN_DYN_OSCILLATION:BOOL=ON -DENABLE_COPASI_EXTUNIT:BOOL=ON \ - -DBLAS_blas_LIBRARY:FILEPATH=%{_libdir}/libopenblas.so -DBLAS_INCLUDE_DIR:PATH=%{_includedir}/openblas \ - -DCLAPACK_INCLUDE_DIR:PATH="" -DLAPACK_lapack_LIBRARY:FILEPATH=%{_libdir}/liblapack.so -DCLAPACK_LIBRARIES:FILEPATH="" \ + -DBLAS_blas_LIBRARY:FILEPATH=%{_libdir}/libflexiblas.so -DBLAS_INCLUDE_DIR:PATH=%{_includedir}/flexiblas \ + -DCLAPACK_INCLUDE_DIR:PATH="" -DLAPACK_lapack_LIBRARY:FILEPATH=%{_libdir}/libflexiblas.so -DCLAPACK_LIBRARIES:FILEPATH="" \ -DCOPASI_OVERWRITE_USE_LAPACK:BOOL=ON -DNO_BLAS_WRAP:BOOL=ON -DBLA_VENDOR=Generic \ -DCROSSGUID_INCLUDE_DIR:PATH=%{_includedir}/crossguid2 \ -DENABLE_FLEX_BISON:BOOL=ON -DENABLE_COPASI_PARAMETERFITTING_RESIDUAL_SCALING:BOOL=ON \ @@ -350,8 +349,7 @@ export LDFLAGS="%{__global_ldflags} -lbz2" -DENABLE_FLEX_BISON:BOOL=ON -DBISON_EXECUTABLE:FILEPATH=%{_bindir}/bison \ -DPREFER_STATIC:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=YES .. -%make_build -popd +%make_build -C build %install %make_install -C build @@ -460,6 +458,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x %{_datadir}/copasi/doc/ %changelog +* Sat Jul 25 2020 Iñaki Úcar - 4.28.226-3 +- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager + * Wed Jun 24 2020 Antonio Trande - 4.28.226-2 - BuildRequires python-setuptools explicitly