Attachment 677085 Details for Bug 739398 – parallel installable libopenblas versions with same SONAME

[patch] parallel installable libopenblas versions with same SONAME

openblas-7.spec.diff (text/plain), 4.96 KB, created by Dominik 'Rathann' Mierzejewski on 2013-01-11 20:31:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dominik 'Rathann' Mierzejewski

Created: 2013-01-11 20:31:12 UTC

Size: 4.96 KB

patch

obsolete

>--- openblas.spec.6	2012-12-25 11:46:06.000000000 +0100
>+++ openblas.spec	2013-01-11 14:54:01.000000000 +0100
>@@ -1,6 +1,6 @@
> Name:		openblas
> Version:	0.2.5
>-Release:	6%{?dist}
>+Release:	7%{?dist}
> Summary:	An optimized BLAS library based on GotoBLAS2
> Group:		Development/Libraries
> License:	BSD
>@@ -132,9 +132,8 @@
> %endif
> 
> make -C serial TARGET=CORE2 DYNAMIC_ARCH=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="%{optflags}" NUM_THREADS=32 %{?avxflag} $LAPACKE
>-make -C threaded TARGET=CORE2 DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="%{optflags}" NUM_THREADS=32 LIBPREFIX="libopenblasp" %{?avxflag} $LAPACKE
>-# USE_THREAD determines use of SMP, not of pthreads
>-make -C openmp TARGET=CORE2 DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=1 FC=gfortran CC=gcc COMMON_OPT="%{optflags}" NUM_THREADS=32 LIBPREFIX="libopenblaso" %{?avxflag} $LAPACKE
>+make -C openmp TARGET=CORE2 DYNAMIC_ARCH=1 USE_THREAD=0 USE_OPENMP=1 FC=gfortran CC=gcc COMMON_OPT="%{optflags}" NUM_THREADS=32 %{?avxflag} $LAPACKE
>+make -C threaded TARGET=CORE2 DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="%{optflags}" NUM_THREADS=32 %{?avxflag} $LAPACKE
> 
> 
> %install
>@@ -157,14 +156,12 @@
> mv %{buildroot}%{_libdir}/${slibname}.a %{buildroot}%{_libdir}/lib%{name}.a
> 
> # Install the OpenMP library
>-olibname=`echo ${slibname} | sed "s|lib%{name}|lib%{name}o|g"`
>-install -D -p -m 755 openmp/${olibname}.so %{buildroot}%{_libdir}/${olibname}.so
>-install -D -p -m 644 openmp/${olibname}.a %{buildroot}%{_libdir}/lib%{name}o.a
>+install -D -p -m 755 openmp/${slibname}.so %{buildroot}%{_libdir}/openblas-omp/${slibname}.so
>+install -D -p -m 644 openmp/${slibname}.a %{buildroot}%{_libdir}/openblas-omp/lib%{name}.a
> 
> # Install the threaded library
>-plibname=`echo ${slibname} | sed "s|lib%{name}|lib%{name}p|g"`
>-install -D -p -m 755 threaded/${plibname}.so %{buildroot}%{_libdir}/${plibname}.so
>-install -D -p -m 644 threaded/${plibname}.a %{buildroot}%{_libdir}/lib%{name}p.a
>+install -D -p -m 755 threaded/${slibname}.so %{buildroot}%{_libdir}/openblas-pth/${slibname}.so
>+install -D -p -m 644 threaded/${slibname}.a %{buildroot}%{_libdir}/openblas-pth/lib%{name}.a
> 
> # Fix source permissions (also applies to LAPACK)
> find -name \*.f -exec chmod 644 {} \;
>@@ -174,18 +171,40 @@
> # Serial libraries
> ln -sf ${slibname}.so lib%{name}.so
> ln -sf ${slibname}.so lib%{name}.so.0
>+mkdir openblas
>+mv lib%{name}* openblas/
> # OpenMP libraries
>-ln -sf ${olibname}.so lib%{name}o.so
>-ln -sf ${olibname}.so lib%{name}o.so.0
>+pushd openblas-omp
>+ln -sf ${slibname}.so lib%{name}.so
>+ln -sf ${slibname}.so lib%{name}.so.0
>+popd
> # Threaded libraries
>-ln -sf ${plibname}.so lib%{name}p.so
>-ln -sf ${plibname}.so lib%{name}p.so.0
>+pushd openblas-pth
>+ln -sf ${slibname}.so lib%{name}.so
>+ln -sf ${slibname}.so lib%{name}.so.0
>+popd
> 
> # Get rid of executable stacks
>-for lib in %{buildroot}%{_libdir}/libopenblas{,o,p}-*.so; do
>+for lib in %{buildroot}%{_libdir}/openblas*/libopenblas-*.so; do
>  execstack -c $lib
> done
> 
>+popd
>+
>+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
>+
>+cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/openblas-%{_target}.conf << __END__
>+%{_libdir}/openblas
>+__END__
>+
>+cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/openblas-%{_target}-omp.conf << __END__
>+%{_libdir}/openblas-omp
>+__END__
>+
>+cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/openblas-%{_target}-pth.conf << __END__
>+%{_libdir}/openblas-pth
>+__END__
>+
> %post -p /sbin/ldconfig
> %postun -p /sbin/ldconfig
> 
>@@ -201,33 +220,40 @@
> %files
> %defattr(-,root,root,-)
> %doc serial/Changelog.txt serial/GotoBLAS* serial/LICENSE
>-%{_libdir}/lib%{name}-*.so
>-%{_libdir}/lib%{name}.so.*
>+%{_sysconfdir}/ld.so.conf.d/openblas-%{_target}.conf
>+%{_libdir}/openblas/lib%{name}-*.so
>+%{_libdir}/openblas/lib%{name}.so.*
> 
> %files openmp
> %defattr(-,root,root,-)
>-%{_libdir}/lib%{name}o-*.so
>-%{_libdir}/lib%{name}o.so.*
>+%{_sysconfdir}/ld.so.conf.d/openblas-%{_target}-omp.conf
>+%{_libdir}/openblas-omp/lib%{name}-*.so
>+%{_libdir}/openblas-omp/lib%{name}.so.*
> 
> %files threads
> %defattr(-,root,root,-)
>-%{_libdir}/lib%{name}p-*.so
>-%{_libdir}/lib%{name}p.so.*
>+%{_sysconfdir}/ld.so.conf.d/openblas-%{_target}-pth.conf
>+%{_libdir}/openblas-pth/lib%{name}-*.so
>+%{_libdir}/openblas-pth/lib%{name}.so.*
> 
> %files devel
> %defattr(-,root,root,-)
>-%{_libdir}/lib%{name}.so
>-%{_libdir}/lib%{name}o.so
>-%{_libdir}/lib%{name}p.so
>+%{_libdir}/openblas/lib%{name}.so
>+%{_libdir}/openblas-omp/lib%{name}.so
>+%{_libdir}/openblas-pth/lib%{name}.so
> %{_includedir}/%{name}
> 
> %files static
> %defattr(-,root,root,-)
>-%{_libdir}/lib%{name}.a
>-%{_libdir}/lib%{name}o.a
>-%{_libdir}/lib%{name}p.a
>+%{_libdir}/openblas/lib%{name}.a
>+%{_libdir}/openblas-omp/lib%{name}.a
>+%{_libdir}/openblas-pth/lib%{name}.a
> 
> %changelog
>+* Fri Jan 11 2013 Dominik Mierzejewski <rpm@greysector.net> - 0.2.5-7
>+- move libraries compiled with different options into different directories
>+  instead of changing SONAMEs
>+
> * Mon Dec 24 2012 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.2.5-6
> - Review fixes.
>

Actions: View | Diff

Attachments on bug 739398: 677085