This commit is contained in:
parent
a9b3b8f2d1
commit
d2124c9258
20
mp.spec
20
mp.spec
|
@ -16,6 +16,12 @@
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
|
||||||
|
%global blaslib flexiblas
|
||||||
|
%else
|
||||||
|
%global blaslib openblas
|
||||||
|
%endif
|
||||||
|
|
||||||
%if 0%{?rhel} && 0%{?rhel} < 7
|
%if 0%{?rhel} && 0%{?rhel} < 7
|
||||||
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
|
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
|
||||||
%endif
|
%endif
|
||||||
|
@ -30,7 +36,7 @@
|
||||||
|
|
||||||
Name: mp
|
Name: mp
|
||||||
Version: 3.1.0
|
Version: 3.1.0
|
||||||
Release: 30.%{date}git%{shortcommit}%{?dist}
|
Release: 31.%{date}git%{shortcommit}%{?dist}
|
||||||
License: MIT and BSD
|
License: MIT and BSD
|
||||||
Summary: An open-source library for mathematical programming
|
Summary: An open-source library for mathematical programming
|
||||||
URL: https://github.com/ampl/mp
|
URL: https://github.com/ampl/mp
|
||||||
|
@ -83,7 +89,7 @@ BuildRequires: git-core
|
||||||
BuildRequires: jacop
|
BuildRequires: jacop
|
||||||
BuildRequires: java-devel
|
BuildRequires: java-devel
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: openblas-devel
|
BuildRequires: %{blaslib}-devel
|
||||||
BuildRequires: pkgconfig(gsl)
|
BuildRequires: pkgconfig(gsl)
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
BuildRequires: pkgconfig(odbc)
|
BuildRequires: pkgconfig(odbc)
|
||||||
|
@ -183,12 +189,7 @@ sed -i 's,returncode == 0,False,' support/build-docs.py
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
export LIBS="-lgsl -l%{blaslib}"
|
||||||
export LIBS="-lgsl -lopenblas"
|
|
||||||
%else
|
|
||||||
export LIBS="-lgsl -L%{_libdir}/atlas -lcblas -latlas"
|
|
||||||
%endif
|
|
||||||
|
|
||||||
mkdir -p build && pushd build
|
mkdir -p build && pushd build
|
||||||
BUILD="asl,gsl,smpswriter"
|
BUILD="asl,gsl,smpswriter"
|
||||||
%if 0%{?with_gecode}
|
%if 0%{?with_gecode}
|
||||||
|
@ -380,6 +381,9 @@ ctest --force-new-ctest-process -j1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 27 2020 Iñaki Úcar <iucar@fedoraproject.org> - 3.1.0-31.20200303git7fd4828
|
||||||
|
- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
|
||||||
|
|
||||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-30.20200303git7fd4828
|
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-30.20200303git7fd4828
|
||||||
- Second attempt - Rebuilt for
|
- Second attempt - Rebuilt for
|
||||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
Loading…
Reference in New Issue