Fix for ia64

This commit is contained in:
Doug Ledford 2006-10-13 18:24:44 +00:00
parent dfe1d27e0f
commit ce4d3fb97b

View File

@ -1,6 +1,6 @@
Name: openmpi Name: openmpi
Version: 1.1 Version: 1.1
Release: 6%{?dist} Release: 7%{?dist}
Summary: Open Message Passing Interface Summary: Open Message Passing Interface
Group: Development/Libraries Group: Development/Libraries
@ -124,10 +124,13 @@ for i in ${RPM_BUILD_ROOT}%{_datadir}/%{name}/help%{mode}/openmpi/mpif{77,90}-wr
mv $i.out $i mv $i.out $i
done done
# and we also need to force the compile mode via the wrapper-data.txt files # and we also need to force the compile mode via the wrapper-data.txt files
# (except on ia64 where the -m64 flag is not allowed by gcc)
%ifnarch ia64
for i in ${RPM_BUILD_ROOT}%{_datadir}/%{name}/help%{mode}/openmpi/*wrapper-data.txt; do for i in ${RPM_BUILD_ROOT}%{_datadir}/%{name}/help%{mode}/openmpi/*wrapper-data.txt; do
sed -e 's#compiler_flags=#compiler_flags=-m'%{mode}' #' < $i > $i.out sed -e 's#compiler_flags=#compiler_flags=-m'%{mode}' #' < $i > $i.out
mv $i.out $i mv $i.out $i
done done
%endif
echo %{_libdir}/%{name} > ${RPM_BUILD_ROOT}%{_libdir}/%{name}/%{name}.ld.conf echo %{_libdir}/%{name} > ${RPM_BUILD_ROOT}%{_libdir}/%{name}/%{name}.ld.conf
# Make the pkgconfig files # Make the pkgconfig files
@ -215,6 +218,9 @@ alternatives --remove mpicc %{_bindir}/opal_wrapper-%{mode}
%changelog %changelog
* Fri Oct 13 2006 Doug Ledford <dledford@redhat.com> - 1.1-7
- ia64 can't take -m64 on the gcc command line, so don't set it there
* Wed Oct 11 2006 Doug Ledford <dledford@redhat.com> - 1.1-6 * Wed Oct 11 2006 Doug Ledford <dledford@redhat.com> - 1.1-6
- Bump rev to match fc6 rev - Bump rev to match fc6 rev
- Fixup some issue with alternatives support - Fixup some issue with alternatives support