Obsolete Rblas package.

This commit is contained in:
Susi Lehtola 2020-08-14 12:49:47 +02:00
parent a07fac9b19
commit 5641975e5c

View File

@ -15,7 +15,7 @@
Name: openblas Name: openblas
Version: 0.3.10 Version: 0.3.10
Release: 3%{?dist} Release: 4%{?dist}
Summary: An optimized BLAS library based on GotoBLAS2 Summary: An optimized BLAS library based on GotoBLAS2
License: BSD License: BSD
URL: https://github.com/xianyi/OpenBLAS/ URL: https://github.com/xianyi/OpenBLAS/
@ -41,6 +41,11 @@ BuildRequires: gcc-gfortran
BuildRequires: perl-devel BuildRequires: perl-devel
BuildRequires: multilib-rpm-config BuildRequires: multilib-rpm-config
# Rblas library is no longer necessary
%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
Obsoletes: %{name}-Rblas < %{version}-%{release}
%endif
# Do we have execstack? # Do we have execstack?
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
%ifarch ppc64le aarch64 %ifarch ppc64le aarch64
@ -103,12 +108,6 @@ Computational Science, ISCAS. http://www.rdcps.ac.cn
%description %description
%{base_description} %{base_description}
%package Rblas
Summary: A version of OpenBLAS for R to use as libRblas
%description Rblas
%{base_description}
%package serial %package serial
Summary: An optimized BLAS library based on GotoBLAS2, serial version Summary: An optimized BLAS library based on GotoBLAS2, serial version
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
@ -259,7 +258,6 @@ rm -rf lapack-netlib
%endif %endif
# Make serial, threaded and OpenMP versions; as well as 64-bit versions # Make serial, threaded and OpenMP versions; as well as 64-bit versions
# Also make an libRblas.so
cd .. cd ..
cp -ar OpenBLAS-%{version} openmp cp -ar OpenBLAS-%{version} openmp
cp -ar OpenBLAS-%{version} threaded cp -ar OpenBLAS-%{version} threaded
@ -268,14 +266,8 @@ for d in {serial,threaded,openmp}64{,_}; do
cp -ar OpenBLAS-%{version} $d cp -ar OpenBLAS-%{version} $d
done done
%endif %endif
cp -ar OpenBLAS-%{version} Rblas
mv OpenBLAS-%{version} serial mv OpenBLAS-%{version} serial
# Hackup Rblas Makefiles
sed -i 's|.so.$(MAJOR_VERSION)|.so|g' Rblas/Makefile
sed -i 's|.so.$(MAJOR_VERSION)|.so|g' Rblas/exports/Makefile
sed -i 's|@ln -fs $(LIBSONAME) $(LIBPREFIX).so|#@ln -fs $(LIBSONAME) $(LIBPREFIX).so|g' Rblas/Makefile
%if %{with system_lapack} %if %{with system_lapack}
# Setup 32-bit interface LAPACK # Setup 32-bit interface LAPACK
mkdir netliblapack mkdir netliblapack
@ -405,8 +397,6 @@ FCOMMON="%{optflags} -fPIC -frecursive"
# Use Fedora linker flags # Use Fedora linker flags
export LDFLAGS="%{__global_ldflags}" export LDFLAGS="%{__global_ldflags}"
make -C Rblas $TARGET USE_THREAD=0 USE_LOCKING=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libRblas" LIBSONAME="libRblas.so" $AVX $LAPACKE INTERFACE64=0
# Declare some necessary build flags # Declare some necessary build flags
COMMON="%{optflags} -fPIC" COMMON="%{optflags} -fPIC"
FCOMMON="$COMMON -frecursive" FCOMMON="$COMMON -frecursive"
@ -466,10 +456,6 @@ else
sname=${slibname} sname=${slibname}
fi fi
# Install the Rblas library
mkdir -p %{buildroot}%{_libdir}/R/lib/
install -p -m 755 Rblas/libRblas.so %{buildroot}%{_libdir}/R/lib/
# Install the OpenMP library # Install the OpenMP library
olibname=`echo ${slibname} | sed "s|lib%{name}|lib%{name}o|g"` olibname=`echo ${slibname} | sed "s|lib%{name}|lib%{name}o|g"`
install -D -p -m 644 openmp/${olibname}.a %{buildroot}%{_libdir}/lib%{name}o.a install -D -p -m 644 openmp/${olibname}.a %{buildroot}%{_libdir}/lib%{name}o.a
@ -573,9 +559,6 @@ ln -sf ${pname64_}.so lib%{name}p64_.so.0
for lib in %{buildroot}%{_libdir}/libopenblas*.so; do for lib in %{buildroot}%{_libdir}/libopenblas*.so; do
execstack -c $lib execstack -c $lib
done done
for lib in %{buildroot}%{_libdir}/R/lib/libRblas*.so; do
execstack -c $lib
done
%endif %endif
# Get rid of generated CMake config # Get rid of generated CMake config
@ -587,8 +570,6 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
%ldconfig_scriptlets openmp %ldconfig_scriptlets openmp
%ldconfig_scriptlets Rblas
%ldconfig_scriptlets threads %ldconfig_scriptlets threads
%if %build64 %if %build64
@ -658,9 +639,6 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
%{_libdir}/lib%{name}p64_.so %{_libdir}/lib%{name}p64_.so
%endif %endif
%files Rblas
%{_libdir}/R/lib/libRblas.so
%files static %files static
%{_libdir}/lib%{name}.a %{_libdir}/lib%{name}.a
%{_libdir}/lib%{name}o.a %{_libdir}/lib%{name}o.a
@ -675,6 +653,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
%endif %endif
%changelog %changelog
* Fri Aug 14 2020 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.10-4
- Obsolete Rblas package (BZ #1849966).
* Tue Aug 11 2020 Jeff Law <law@redhat.com> - 0.3.10-3 * Tue Aug 11 2020 Jeff Law <law@redhat.com> - 0.3.10-3
- Disable LTO - Disable LTO