rpms
/
R
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix openblas conditionals, openblas has wider arch support everywhere except el7

This commit is contained in:
Tom Callaway 2020-02-18 17:10:52 -05:00
parent 85586e3bcf
commit 2d600e0a99
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
R.spec
View File

@ -14,18 +14,22 @@
%endif %endif
%endif %endif
%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64 %if 0%{?rhel} >= 8
%if 0%{?rhel} >= 7 %global openblas 1
%global openblas 1
%else %else
%if 0%{?fedora} >= 23 %if 0%{?rhel} == 7
%global openblas 1 %ifarch x86_64 %{ix86} armv7hl %{power64} aarch64
%else %global openblas 1
%global openblas 0 %else
%endif %global openblas 0
%endif %endif
%else %else
%global openblas 0 %if 0%{?fedora}
%global openblas 1
%else
%global openblas 0
%endif
%endif
%endif %endif
%if 0%{?fedora} >= 31 %if 0%{?fedora} >= 31
@ -141,7 +145,7 @@
Name: R Name: R
Version: 3.6.2 Version: 3.6.2
Release: 4%{?dist} Release: 5%{?dist}
Summary: A language for data analysis and graphics Summary: A language for data analysis and graphics
URL: http://www.r-project.org URL: http://www.r-project.org
Source0: https://cran.r-project.org/src/base/R-3/R-%{version}.tar.gz Source0: https://cran.r-project.org/src/base/R-3/R-%{version}.tar.gz
@ -1233,6 +1237,9 @@ R CMD javareconf \
%{_libdir}/libRmath.a %{_libdir}/libRmath.a
%changelog %changelog
* Tue Feb 18 2020 Tom Callaway <spot@fedoraproject.org> - 3.6.2-5
- fix openblas conditionals, openblas has wider arch support everywhere except el7
* Tue Feb 18 2020 Tom Callaway <spot@fedoraproject.org> - 3.6.2-4 * Tue Feb 18 2020 Tom Callaway <spot@fedoraproject.org> - 3.6.2-4
- fix conditionals so that Fedora builds against system openblas for lapack/blas - fix conditionals so that Fedora builds against system openblas for lapack/blas
and we only generate the R lapack/blas libs on RHEL 5-6-7 (where system lapack/openblas and we only generate the R lapack/blas libs on RHEL 5-6-7 (where system lapack/openblas