aarch64 has execstack in Fedora, Minor spec cleanups

This commit is contained in:
Peter Robinson 2016-07-14 04:01:48 +01:00
parent eab45150c6
commit a4cbd50608
2 changed files with 10 additions and 35 deletions

14
.gitignore vendored
View File

@ -1,13 +1 @@
/v0.2.5.tar.gz /v0.2.*tar.gz
/v0.2.7.tar.gz
/v0.2.8.tar.gz
/v0.2.9.tar.gz
/v0.2.10.tar.gz
/v0.2.11.tar.gz
/v0.2.12.tar.gz
/v0.2.13.tar.gz
/v0.2.14.tar.gz
/v0.2.15.tar.gz
/v0.2.16.tar.gz
/openblas-0.2.17.tar.gz
/v0.2.18.tar.gz

View File

@ -4,7 +4,7 @@
Name: openblas Name: openblas
Version: 0.2.18 Version: 0.2.18
Release: 3%{?dist} Release: 4%{?dist}
Summary: An optimized BLAS library based on GotoBLAS2 Summary: An optimized BLAS library based on GotoBLAS2
Group: Development/Libraries Group: Development/Libraries
License: BSD License: BSD
@ -31,12 +31,9 @@ BuildRequires: gcc-gfortran
%global execstack 1 %global execstack 1
%endif %endif
%else %else
%ifarch aarch64
%global execstack 0
%else
%global execstack 1 %global execstack 1
%endif %endif
%endif
%if %{execstack} %if %{execstack}
BuildRequires: /usr/bin/execstack BuildRequires: /usr/bin/execstack
%endif %endif
@ -81,7 +78,7 @@ BuildRequires: lapack64-static
# Upstream supports the package only on these architectures. # Upstream supports the package only on these architectures.
# Runtime processor detection is not available on other archs. # Runtime processor detection is not available on other archs.
ExclusiveArch: x86_64 %{ix86} armv7hl %{power64} aarch64 ExclusiveArch: x86_64 %{ix86} %{arm} %{power64} aarch64
%global base_description \ %global base_description \
OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD \ OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD \
@ -332,7 +329,7 @@ export AVX="NO_AVX2=1"
%endif %endif
%endif %endif
%ifarch armv7hl %ifarch %{arm}
TARGET="TARGET=ARMV7 DYNAMIC_ARCH=0" TARGET="TARGET=ARMV7 DYNAMIC_ARCH=0"
%endif %endif
%ifarch ppc64 %ifarch ppc64
@ -372,7 +369,6 @@ make -C openmp64_ $TARGET USE_THREAD=1 USE_OPENMP=1 FC=gfortran CC=gcc COMMON_
%endif %endif
%install %install
rm -rf %{buildroot}
# Install serial library and headers # Install serial library and headers
make -C serial USE_THREAD=0 PREFIX=%{buildroot} OPENBLAS_LIBRARY_DIR=%{buildroot}%{_libdir} OPENBLAS_INCLUDE_DIR=%{buildroot}%{_includedir}/%name OPENBLAS_BINARY_DIR=%{buildroot}%{_bindir} OPENBLAS_CMAKE_DIR=%{buildroot}%{_libdir}/cmake install make -C serial USE_THREAD=0 PREFIX=%{buildroot} OPENBLAS_LIBRARY_DIR=%{buildroot}%{_libdir} OPENBLAS_INCLUDE_DIR=%{buildroot}%{_includedir}/%name OPENBLAS_BINARY_DIR=%{buildroot}%{_bindir} OPENBLAS_CMAKE_DIR=%{buildroot}%{_libdir}/cmake install
@ -382,7 +378,7 @@ cp -a %{_includedir}/lapacke %{buildroot}%{_includedir}/%{name}
%endif %endif
# Fix name of libraries # Fix name of libraries
%ifarch armv7hl %ifarch %{arm}
suffix="_armv7" suffix="_armv7"
%endif %endif
%ifarch ppc64 %ifarch ppc64
@ -540,59 +536,47 @@ rm -rf %{buildroot}%{_libdir}/cmake
%postun threads64_ -p /sbin/ldconfig %postun threads64_ -p /sbin/ldconfig
%endif %endif
%clean
rm -rf %{buildroot}
%files %files
%defattr(-,root,root,-)
%doc serial/Changelog.txt serial/GotoBLAS* serial/LICENSE %doc serial/Changelog.txt serial/GotoBLAS* serial/LICENSE
%{_libdir}/lib%{name}-*.so %{_libdir}/lib%{name}-*.so
%{_libdir}/lib%{name}.so.* %{_libdir}/lib%{name}.so.*
%files openmp %files openmp
%defattr(-,root,root,-)
%{_libdir}/lib%{name}o-*.so %{_libdir}/lib%{name}o-*.so
%{_libdir}/lib%{name}o.so.* %{_libdir}/lib%{name}o.so.*
%files threads %files threads
%defattr(-,root,root,-)
%{_libdir}/lib%{name}p-*.so %{_libdir}/lib%{name}p-*.so
%{_libdir}/lib%{name}p.so.* %{_libdir}/lib%{name}p.so.*
%if %build64 %if %build64
%files serial64 %files serial64
%defattr(-,root,root,-)
%{_libdir}/lib%{name}64-*.so %{_libdir}/lib%{name}64-*.so
%{_libdir}/lib%{name}64.so.* %{_libdir}/lib%{name}64.so.*
%files openmp64 %files openmp64
%defattr(-,root,root,-)
%{_libdir}/lib%{name}o64-*.so %{_libdir}/lib%{name}o64-*.so
%{_libdir}/lib%{name}o64.so.* %{_libdir}/lib%{name}o64.so.*
%files threads64 %files threads64
%defattr(-,root,root,-)
%{_libdir}/lib%{name}p64-*.so %{_libdir}/lib%{name}p64-*.so
%{_libdir}/lib%{name}p64.so.* %{_libdir}/lib%{name}p64.so.*
%files serial64_ %files serial64_
%defattr(-,root,root,-)
%{_libdir}/lib%{name}64_-*.so %{_libdir}/lib%{name}64_-*.so
%{_libdir}/lib%{name}64_.so.* %{_libdir}/lib%{name}64_.so.*
%files openmp64_ %files openmp64_
%defattr(-,root,root,-)
%{_libdir}/lib%{name}o64_-*.so %{_libdir}/lib%{name}o64_-*.so
%{_libdir}/lib%{name}o64_.so.* %{_libdir}/lib%{name}o64_.so.*
%files threads64_ %files threads64_
%defattr(-,root,root,-)
%{_libdir}/lib%{name}p64_-*.so %{_libdir}/lib%{name}p64_-*.so
%{_libdir}/lib%{name}p64_.so.* %{_libdir}/lib%{name}p64_.so.*
%endif %endif
%files devel %files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}/ %{_includedir}/%{name}/
%{_libdir}/lib%{name}.so %{_libdir}/lib%{name}.so
%{_libdir}/lib%{name}o.so %{_libdir}/lib%{name}o.so
@ -607,7 +591,6 @@ rm -rf %{buildroot}
%endif %endif
%files static %files static
%defattr(-,root,root,-)
%{_libdir}/lib%{name}.a %{_libdir}/lib%{name}.a
%{_libdir}/lib%{name}o.a %{_libdir}/lib%{name}o.a
%{_libdir}/lib%{name}p.a %{_libdir}/lib%{name}p.a
@ -621,6 +604,10 @@ rm -rf %{buildroot}
%endif %endif
%changelog %changelog
* Wed Jul 13 2016 Peter Robinson <pbrobinson@fedoraproject.org> 0.2.18-4
- aarch64 has execstack in Fedora
- Minor spec cleanups
* Wed Jul 13 2016 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.2.18-3 * Wed Jul 13 2016 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.2.18-3
- Enable ppc64 and ppc64p7 architectures - Enable ppc64 and ppc64p7 architectures
based on Dan Horák's patch (BZ #1356189). based on Dan Horák's patch (BZ #1356189).