Attachment 912845 Details for Bug 1112864 – port to EPEL6

[patch] port to EPEL6

elpa.spec.patch (text/plain), 7.58 KB, created by Dave Love on 2014-06-27 14:27:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Love

Created: 2014-06-27 14:27:41 UTC

Size: 7.58 KB

patch

obsolete

>--- elpa.spec.orig	2014-06-26 13:53:09.000000000 +0100
>+++ elpa.spec	2014-06-27 15:04:50.484725508 +0100
>@@ -1,10 +1,25 @@
>+# Note also for EPEL6: We can't patch the autotools files as they
>+# stand because they require a later autoconf than is in EPEL6.  That
>+# rules out the _mt version.  Correct scalapack/blacs detection by
>+# configure is arranged by specifying LIBS instead.  See the el6
>+# conditions below.  We also need the usual cliche for MPICH names.
>+%if 0%{?el6}
>+%global mpich mpich2
>+%global mpich_load %_mpich2_load
>+%global mpich_unload %_mpich2_unload
>+%else
>+%global mpich mpich
>+%global mpich_load %_mpich_load
>+%global mpich_unload %_mpich_unload
>+%endif
>+
> %global rel 008
> %global snap 20140321
> 
> Summary: High-performance library for parallel solution of eigenvalue problems
> Name: elpa
> Version: 2013.11
>-Release: 2.%{rel}%{?dist}
>+Release: 2liv.%{rel}%{?dist}
> URL: http://elpa.rzg.mpg.de/
> # http://elpa.rzg.mpg.de/elpa-tar-archive/elpa-2013-11.006/at_download/file
> Source0: ELPA_%{version}.%{rel}_%{snap}.tar.gz
>@@ -46,28 +61,28 @@
> 
> This package contains common files for ELPA.
> 
>-%package mpich
>+%package %{mpich}
> Summary: Fast library for parallel solution of eigenvalue problems (MPICH version)
>-BuildRequires: mpich-devel
>-BuildRequires: blacs-mpich-devel
>-BuildRequires: scalapack-mpich-devel
>-Requires: blacs-mpich
>-Requires: scalapack-mpich
>+BuildRequires: %{mpich}-devel
>+BuildRequires: blacs-%{mpich}-devel
>+BuildRequires: scalapack-%{mpich}-devel
>+Requires: blacs-%{mpich}
>+Requires: scalapack-%{mpich}
> Requires: %{name}-common = %{version}-%{release}
> 
>-%description mpich
>+%description %{mpich}
> ELPA is a Fortran-based high-performance computational library for the
> (massively) parallel solution of symmetric or Hermitian, standard or generalized
> eigenvalue problems.
> 
> This package contains ELPA built against MPICH.
> 
>-%package mpich-devel
>+%package %{mpich}-devel
> Summary: Development files for ELPA (MPICH version)
>-Requires: %{name}-mpich%{?_isa} = %{version}-%{release}
>+Requires: %{name}-%{mpich}%{?_isa} = %{version}-%{release}
> Requires: gcc-gfortran%{_isa}
> 
>-%description mpich-devel
>+%description %{mpich}-devel
> ELPA is a Fortran-based high-performance computational library for the
> (massively) parallel solution of symmetric or Hermitian, standard or generalized
> eigenvalue problems.
>@@ -111,11 +126,15 @@
> %else \
>  --with-generic \\\
> %endif \
>+%if 0%{?el6} \
>+ LIBS="-Wl,--as-needed -L$MPI_LIB -lscalapack -lmpiblacs -lmpiblacsCinit -lblas" \\\
>+%endif \
> 
> %prep
> %setup -q -c -T -a 0
>-mv ELPA_%{version} mpich
>-pushd mpich
>+mv ELPA_%{version} %{mpich}
>+pushd %{mpich}
>+%if 0%{!?el6}
> %if 0%{?fedora} < 21
> %patch0 -p1 -b .blacs
> %else
>@@ -123,10 +142,11 @@
> %endif
> %patch2 -p1 -b .r
> autoreconf -vifs
>+%endif
> popd
>-cp -pr mpich openmpi
>+cp -pr %{mpich} openmpi
> mkdir _mt
>-cp -pr mpich openmpi _mt/
>+cp -pr %{mpich} openmpi _mt/
> 
> %build
> %if 0%{?fedora} < 21
>@@ -134,11 +154,11 @@
> %endif
> export FCFLAGS=-ffree-line-length-none
> 
>-%{_mpich_load}
>+%{mpich_load}
> export LDFLAGS="-L$MPI_LIB"
>-pushd mpich
>+pushd %{mpich}
> %configure_in \
>- --libdir=%{_libdir}/mpich%{?_opt_cc_suffix}/lib
>+ --libdir=%{_libdir}/%{mpich}%{?_opt_cc_suffix}/lib
> 
> # work around libtool bug
> sed -i -e 's/-l -l //' libtool
>@@ -146,17 +166,19 @@
> # %{?_smp_mflags}
> popd
> 
>-pushd _mt/mpich
>+%if 0%{!?el6}
>+pushd _mt/%{mpich}
> %configure_in \
>  --with-openmp \
>- --libdir=%{_libdir}/mpich%{?_opt_cc_suffix}/lib
>+ --libdir=%{_libdir}/%{mpich}%{?_opt_cc_suffix}/lib
> 
> # work around libtool bug
> sed -i -e 's/-l -l //' libtool
> make
> # %{?_smp_mflags}
> popd
>-%{_mpich_unload}
>+%endif
>+%{mpich_unload}
> 
> %{_openmpi_load}
> export LDFLAGS="-L$MPI_LIB"
>@@ -170,6 +192,7 @@
> # %{?_smp_mflags}
> popd
> 
>+%if 0%{!?el6}
> pushd _mt/openmpi
> %configure_in \
>  --with-openmp \
>@@ -180,14 +203,19 @@
> make
> # %{?_smp_mflags}
> popd
>+%endif
> %{_openmpi_unload}
> 
> %install
>-for s in '' _mt ; do
>-  for mpi in mpich openmpi ; do
>+for s in ''\
>+%if 0%{!?el6}
>+ _mt \
>+%endif
>+; do
>+  for mpi in %{mpich} openmpi ; do
>     pushd ${s:-.}/${mpi}
>     make DESTDIR=%{buildroot} install
>-    execstack -c .libs/libelpa${s}.so.0.* %{buildroot}%{_libdir}/mpich%{?_opt_cc_suffix}/lib/libelpa${s}.so.0.*
>+    execstack -c .libs/libelpa${s}.so.0.* %{buildroot}%{_libdir}/%{mpich}%{?_opt_cc_suffix}/lib/libelpa${s}.so.0.*
>     mkdir -p %{buildroot}%{_fmoddir}/${mpi}%{?_opt_cc_suffix}
>     mv %{buildroot}%{_includedir}/elpa/modules/elpa1.mod %{buildroot}%{_fmoddir}/${mpi}%{?_cc_name_suffix}/elpa1${s}.mod
>     mv %{buildroot}%{_includedir}/elpa/modules/elpa2.mod %{buildroot}%{_fmoddir}/${mpi}%{?_cc_name_suffix}/elpa2${s}.mod
>@@ -202,14 +230,16 @@
> 
> %if 0
> %check
>-%{_mpich_load}
>-pushd mpich
>+%{mpich_load}
>+pushd %{mpich}
> make check
> popd
>-pushd _mt/mpich
>+%if 0%{!?el6}
>+pushd _mt/%{mpich}
> make check
> popd
>-%{_mpich_unload}
>+%endif
>+%{mpich_unload}
> 
> # only non-mt openmpi build can be tested, see bug #1105902
> %{_openmpi_load}
>@@ -219,47 +249,58 @@
> %{_openmpi_unload}
> %endif
> 
>-%post mpich -p /sbin/ldconfig
>+%post %{mpich} -p /sbin/ldconfig
> 
>-%postun mpich -p /sbin/ldconfig
>+%postun %{mpich} -p /sbin/ldconfig
> 
> %post openmpi -p /sbin/ldconfig
> 
> %postun openmpi -p /sbin/ldconfig
> 
> %files common
>-%doc mpich/COPYING/* mpich/README
>+%doc %{mpich}/COPYING/* %{mpich}/README
> 
>-%files mpich
>-%{_libdir}/mpich%{?_opt_cc_suffix}/lib/libelpa.so.0*
>-%{_libdir}/mpich%{?_opt_cc_suffix}/lib/libelpa_mt.so.0*
>-
>-%files mpich-devel
>-%{_libdir}/mpich%{?_opt_cc_suffix}/lib/libelpa.so
>-%{_libdir}/mpich%{?_opt_cc_suffix}/lib/libelpa_mt.so
>-%{_libdir}/mpich%{?_opt_cc_suffix}/lib/pkgconfig/elpa.pc
>-%{_libdir}/mpich%{?_opt_cc_suffix}/lib/pkgconfig/elpa_mt.pc
>-%{_fmoddir}/mpich%{?_cc_name_suffix}/elpa1.mod
>-%{_fmoddir}/mpich%{?_cc_name_suffix}/elpa2.mod
>-%{_fmoddir}/mpich%{?_cc_name_suffix}/elpa1_mt.mod
>-%{_fmoddir}/mpich%{?_cc_name_suffix}/elpa2_mt.mod
>+%files %{mpich}
>+%{_libdir}/%{mpich}%{?_opt_cc_suffix}/lib/libelpa.so.0*
>+%if 0%{!?el6}
>+%{_libdir}/%{mpich}%{?_opt_cc_suffix}/lib/libelpa_mt.so.0*
>+%endif
>+
>+%files %{mpich}-devel
>+%{_libdir}/%{mpich}%{?_opt_cc_suffix}/lib/libelpa.so
>+%if 0%{!?el6}
>+%{_libdir}/%{mpich}%{?_opt_cc_suffix}/lib/libelpa_mt.so
>+%{_libdir}/%{mpich}%{?_opt_cc_suffix}/lib/pkgconfig/elpa_mt.pc
>+%{_fmoddir}/%{mpich}%{?_cc_name_suffix}/elpa1_mt.mod
>+%{_fmoddir}/%{mpich}%{?_cc_name_suffix}/elpa2_mt.mod
>+%endif
>+%{_libdir}/%{mpich}%{?_opt_cc_suffix}/lib/pkgconfig/elpa.pc
>+%{_fmoddir}/%{mpich}%{?_cc_name_suffix}/elpa1.mod
>+%{_fmoddir}/%{mpich}%{?_cc_name_suffix}/elpa2.mod
> 
> # only non-mt openmpi build, see bug #1105902
> %files openmpi
> %{_libdir}/openmpi%{?_opt_cc_suffix}/lib/libelpa.so.0*
>+%if 0%{!?el6}
> %exclude %{_libdir}/openmpi%{?_opt_cc_suffix}/lib/libelpa_mt.so.0*
>+%endif
> 
> %files openmpi-devel
> %{_libdir}/openmpi%{?_opt_cc_suffix}/lib/libelpa.so
>+%if 0%{!?el6}
> %exclude %{_libdir}/openmpi%{?_opt_cc_suffix}/lib/libelpa_mt.so
>-%{_libdir}/openmpi%{?_opt_cc_suffix}/lib/pkgconfig/elpa.pc
> %exclude %{_libdir}/openmpi%{?_opt_cc_suffix}/lib/pkgconfig/elpa_mt.pc
>-%{_fmoddir}/openmpi%{?_cc_name_suffix}/elpa1.mod
>-%{_fmoddir}/openmpi%{?_cc_name_suffix}/elpa2.mod
> %exclude %{_fmoddir}/openmpi%{?_cc_name_suffix}/elpa1_mt.mod
> %exclude %{_fmoddir}/openmpi%{?_cc_name_suffix}/elpa2_mt.mod
>+%endif
>+%{_libdir}/openmpi%{?_opt_cc_suffix}/lib/pkgconfig/elpa.pc
>+%{_fmoddir}/openmpi%{?_cc_name_suffix}/elpa1.mod
>+%{_fmoddir}/openmpi%{?_cc_name_suffix}/elpa2.mod
> 
> %changelog
>+* Fri Jun 27 2014 Dave Love <d.love@liverpool.ac.uk> - 2013.11-2liv.008%{?dist}
>+- Port to EPEL6 (rather messily), dropping _mt version on it
>+
> * Thu Jun 26 2014 Dominik Mierzejewski <rpm@greysector.net> 2013.11-2.008
> - remove executable stack from installed libraries
> - fix undefined non-weak mpi symbols

Actions: View | Diff

Attachments on bug 1112864: 912845