mpi* compilers conf no more

This commit is contained in:
Deji Akingunola 2014-02-21 09:51:49 -05:00
parent e016b78f79
commit 642fdc3757

View File

@ -13,7 +13,7 @@ Source1: mpich.macros
Patch0: mpich-modules.patch Patch0: mpich-modules.patch
BuildRequires: gcc-gfortran BuildRequires: gcc-gfortran
BuildRequires: hwloc-devel >= 1.6 BuildRequires: hwloc-devel >= 1.8
%ifnarch s390 s390x aarch64 %ifnarch s390 s390x aarch64
BuildRequires: valgrind-devel BuildRequires: valgrind-devel
%endif %endif
@ -122,7 +122,6 @@ Contains documentations, examples and man-pages for mpich
--enable-fc \ --enable-fc \
--with-device=%{selected_channels} \ --with-device=%{selected_channels} \
--with-pm=hydra:gforker \ --with-pm=hydra:gforker \
--sysconfdir=%{_sysconfdir}/%{name}-%{_arch} \
--includedir=%{_includedir}/%{name}-%{_arch} \ --includedir=%{_includedir}/%{name}-%{_arch} \
--bindir=%{_libdir}/%{name}/bin \ --bindir=%{_libdir}/%{name}/bin \
--libdir=%{_libdir}/%{name}/lib \ --libdir=%{_libdir}/%{name}/lib \
@ -139,7 +138,7 @@ Contains documentations, examples and man-pages for mpich
FFLAGS="%{m_option} -O2 %{?XFLAGS}" \ FFLAGS="%{m_option} -O2 %{?XFLAGS}" \
LDFLAGS='-Wl,-z,noexecstack' \ LDFLAGS='-Wl,-z,noexecstack' \
MPICHLIB_CFLAGS="%{?opt_cc_cflags}" \ MPICHLIB_CFLAGS="%{?opt_cc_cflags}" \
MPICHLIB_CXXFLAGS="%{optflags}" \ MPICHLIB_CXXFLAGS="%{optflags}" \
MPICHLIB_FCFLAGS="%{?opt_fc_fflags}" \ MPICHLIB_FCFLAGS="%{?opt_fc_fflags}" \
MPICHLIB_FFLAGS="%{?opt_f77_fflags}" MPICHLIB_FFLAGS="%{?opt_f77_fflags}"
# MPICHLIB_LDFLAGS='-Wl,-z,noexecstack' \ # MPICHLIB_LDFLAGS='-Wl,-z,noexecstack' \
@ -183,9 +182,6 @@ cp -p %{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.{sh,csh}
mkdir -p %{buildroot}%{_sysconfdir}/rpm mkdir -p %{buildroot}%{_sysconfdir}/rpm
cp -pr %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.%{name} cp -pr %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.%{name}
# Silence rpmlint
sed -i '/^#! \//,1 d' %{buildroot}%{_sysconfdir}/%{name}-%{_arch}/mpi*.conf
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
rm -f %{buildroot}%{_libdir}/%{name}/lib/lib{*mpich*,opa,mpl}.a rm -f %{buildroot}%{_libdir}/%{name}/lib/lib{*mpich*,opa,mpl}.a
@ -203,7 +199,6 @@ make check
%dir %{_libdir}/%{name}/bin %dir %{_libdir}/%{name}/bin
%{_libdir}/%{name}/lib/*.so.* %{_libdir}/%{name}/lib/*.so.*
%{_libdir}/%{name}/bin/* %{_libdir}/%{name}/bin/*
%config %{_sysconfdir}/%{name}-%{_arch}/
%dir %{python_sitearch}/%{name} %dir %{python_sitearch}/%{name}
%dir %{_mandir}/%{name} %dir %{_mandir}/%{name}
%doc %{_mandir}/%{name}/man1/ %doc %{_mandir}/%{name}/man1/