This commit is contained in:
parent
07d744324a
commit
9344422d47
38
R.spec
38
R.spec
@ -7,6 +7,7 @@
|
|||||||
# We decided to implement this change in Fedora 32+ and EPEL-8 only.
|
# We decided to implement this change in Fedora 32+ and EPEL-8 only.
|
||||||
# This was to minimize the impact on end-users who might have R modules
|
# This was to minimize the impact on end-users who might have R modules
|
||||||
# installed locally with the old dependency on libRlapack.so
|
# installed locally with the old dependency on libRlapack.so
|
||||||
|
|
||||||
%if 0%{?fedora} >= 32
|
%if 0%{?fedora} >= 32
|
||||||
%global syslapack 1
|
%global syslapack 1
|
||||||
%else
|
%else
|
||||||
@ -35,6 +36,12 @@
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?fedora} >= 33
|
||||||
|
%global flexiblas 1
|
||||||
|
%else
|
||||||
|
%global flexiblas 0
|
||||||
|
%endif
|
||||||
|
|
||||||
%if 0%{?fedora} >= 31
|
%if 0%{?fedora} >= 31
|
||||||
%global usemacros 1
|
%global usemacros 1
|
||||||
%else
|
%else
|
||||||
@ -152,7 +159,7 @@
|
|||||||
|
|
||||||
Name: R
|
Name: R
|
||||||
Version: %{major_version}.%{minor_version}.%{patch_version}
|
Version: %{major_version}.%{minor_version}.%{patch_version}
|
||||||
Release: 3%{?dist}
|
Release: 4%{?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-4/R-%{version}.tar.gz
|
Source0: https://cran.r-project.org/src/base/R-4/R-%{version}.tar.gz
|
||||||
@ -236,16 +243,22 @@ BuildRequires: java
|
|||||||
BuildRequires: tre-devel
|
BuildRequires: tre-devel
|
||||||
BuildRequires: autoconf, automake, libtool
|
BuildRequires: autoconf, automake, libtool
|
||||||
%endif
|
%endif
|
||||||
|
%if %{flexiblas}
|
||||||
|
BuildRequires: flexiblas-devel
|
||||||
|
%else
|
||||||
%if %{openblas}
|
%if %{openblas}
|
||||||
BuildRequires: openblas-devel
|
BuildRequires: openblas-devel
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %{syslapack}
|
%if %{syslapack}
|
||||||
|
%if !%{flexiblas}
|
||||||
%if !%{openblas}
|
%if !%{openblas}
|
||||||
BuildRequires: lapack-devel >= 3.5.0-7
|
BuildRequires: lapack-devel >= 3.5.0-7
|
||||||
BuildRequires: blas-devel >= 3.5.0-7
|
BuildRequires: blas-devel >= 3.5.0-7
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
|
BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
|
||||||
BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel
|
BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel
|
||||||
@ -310,10 +323,12 @@ Requires: sed, gawk, tex(latex), less, make, unzip
|
|||||||
Requires: libRmath%{?_isa} = %{version}-%{release}
|
Requires: libRmath%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
%if !%{syslapack}
|
%if !%{syslapack}
|
||||||
|
%if !%{flexiblas}
|
||||||
%if %{openblas}
|
%if %{openblas}
|
||||||
Requires: openblas-Rblas
|
Requires: openblas-Rblas
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %{use_devtoolset}
|
%if %{use_devtoolset}
|
||||||
# We need it for CXX11 and higher support.
|
# We need it for CXX11 and higher support.
|
||||||
@ -394,10 +409,14 @@ Requires: pcre-devel
|
|||||||
Requires: pcre2-devel
|
Requires: pcre2-devel
|
||||||
%endif
|
%endif
|
||||||
%if %{syslapack}
|
%if %{syslapack}
|
||||||
|
%if %{flexiblas}
|
||||||
|
Requires: flexiblas-devel
|
||||||
|
%else
|
||||||
%if %{openblas}
|
%if %{openblas}
|
||||||
Requires: openblas-devel
|
Requires: openblas-devel
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
%if %{modern}
|
%if %{modern}
|
||||||
Requires: libicu-devel
|
Requires: libicu-devel
|
||||||
%endif
|
%endif
|
||||||
@ -652,6 +671,11 @@ export FFLAGS="%{optflags} --no-optimize-sibling-calls"
|
|||||||
# of the R bundled blas, that can be replaced by an optimized version.
|
# of the R bundled blas, that can be replaced by an optimized version.
|
||||||
# It also results in R using the bundled lapack copy.
|
# It also results in R using the bundled lapack copy.
|
||||||
|
|
||||||
|
%if %{flexiblas}
|
||||||
|
# avoid this check
|
||||||
|
sed -i '/"checking whether the BLAS is complete/i r_cv_complete_blas=yes' configure
|
||||||
|
%endif
|
||||||
|
|
||||||
( %configure \
|
( %configure \
|
||||||
%if 0%{?rhel} && 0%{?rhel} <= 5
|
%if 0%{?rhel} && 0%{?rhel} <= 5
|
||||||
--with-readline=no \
|
--with-readline=no \
|
||||||
@ -662,7 +686,11 @@ export FFLAGS="%{optflags} --no-optimize-sibling-calls"
|
|||||||
--with-system-valgrind-headers \
|
--with-system-valgrind-headers \
|
||||||
%if %{syslapack}
|
%if %{syslapack}
|
||||||
--with-lapack \
|
--with-lapack \
|
||||||
|
%if %{flexiblas}
|
||||||
|
--with-blas="flexiblas" \
|
||||||
|
%else
|
||||||
--with-blas \
|
--with-blas \
|
||||||
|
%endif
|
||||||
%else
|
%else
|
||||||
--enable-BLAS-shlib \
|
--enable-BLAS-shlib \
|
||||||
%endif
|
%endif
|
||||||
@ -684,8 +712,7 @@ export FFLAGS="%{optflags} --no-optimize-sibling-calls"
|
|||||||
%endif
|
%endif
|
||||||
rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \
|
rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \
|
||||||
rincludedir=%{_includedir}/R \
|
rincludedir=%{_includedir}/R \
|
||||||
rsharedir=%{_datadir}/R) \
|
rsharedir=%{_datadir}/R) | tee CONFIGURE.log
|
||||||
> CONFIGURE.log
|
|
||||||
cat CONFIGURE.log | grep -A30 'R is now' - > CAPABILITIES
|
cat CONFIGURE.log | grep -A30 'R is now' - > CAPABILITIES
|
||||||
%if 0%{?zlibhack}
|
%if 0%{?zlibhack}
|
||||||
make V=1 CURL_CPPFLAGS='-DCURL_STATICLIB -I%{_builddir}/%{name}-%{version}/curl-%{curlv}/target%{_includedir}' CURL_LIBS=`%{_builddir}/%{name}-%{version}/curl-%{curlv}/target/usr/bin/curl-config --libs`
|
make V=1 CURL_CPPFLAGS='-DCURL_STATICLIB -I%{_builddir}/%{name}-%{version}/curl-%{curlv}/target%{_includedir}' CURL_LIBS=`%{_builddir}/%{name}-%{version}/curl-%{curlv}/target/usr/bin/curl-config --libs`
|
||||||
@ -808,11 +835,13 @@ sed -i 's|/builddir/build/BUILD/R-%{version}/curl-%{curlv}/target%{_libdir}/:/bu
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if !%{syslapack}
|
%if !%{syslapack}
|
||||||
|
%if !%{flexiblas}
|
||||||
%if %{openblas}
|
%if %{openblas}
|
||||||
# Rename the R blas so.
|
# Rename the R blas so.
|
||||||
mv %{buildroot}%{_libdir}/R/lib/libRblas.so %{buildroot}%{_libdir}/R/lib/libRrefblas.so
|
mv %{buildroot}%{_libdir}/R/lib/libRblas.so %{buildroot}%{_libdir}/R/lib/libRrefblas.so
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
# okay, look. its very clear that upstream does not run the test suite on any non-intel architectures.
|
# okay, look. its very clear that upstream does not run the test suite on any non-intel architectures.
|
||||||
%check
|
%check
|
||||||
@ -1249,6 +1278,9 @@ R CMD javareconf \
|
|||||||
%{_libdir}/libRmath.a
|
%{_libdir}/libRmath.a
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Aug 07 2020 Iñaki Úcar <iucar@fedoraproject.org> - 4.0.2-4
|
||||||
|
- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
|
||||||
|
|
||||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.2-3
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.2-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user