Attachment 158351 Details for Bug 246484 – Patch to the openmpi spec file

[patch] Patch to the openmpi spec file

openmpi_spec.patch (text/plain), 2.03 KB, created by Deji Akingunola on 2007-07-02 17:08:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Deji Akingunola

Created: 2007-07-02 17:08:19 UTC

Size: 2.03 KB

patch

obsolete

>--- openmpi.spec	2007-07-02 12:38:43.000000000 -0400
>+++ openmpi.spec.new	2007-06-30 11:19:53.000000000 -0400
>@@ -46,9 +46,11 @@
> # We only compile with gcc, but other people may want other compilers.
> # Set the compiler here.
> %define opt_cc gcc
>+%define opt_fc gfortran
> # Optional CFLAGS to use with the specific compiler...gcc doesn't need any,
> # so uncomment and define to use
> #define opt_cc_cflags
>+%define opt_fc_fflags %{optflags}
> 
> # When dealing with multilib installations, aka the ability to run either
> # i386 or x86_64 binaries on x86_64 machines, we install the native i386
>@@ -113,10 +115,13 @@
> 	--mandir=%{_datadir}/%{mpidir}/man \
> 	--with-libnuma=%{_libdir} \
> 	CC=%{opt_cc} \
>+	FC=%{opt_for} \
>+	F77=%{opt_for} \
> 	LDFLAGS='-Wl,-z,noexecstack' \
> 	CFLAGS="%{?opt_cc_cflags} $RPM_OPT_FLAGS $XFLAGS" \
> 	CXXFLAGS="$RPM_OPT_FLAGS $XFLAGS" \
>-	FFLAGS="$RPM_OPT_FLAGS $XFLAGS";
>+	FCFLAGS="%{?opt_fc_fflags} $XFLAGS" \
>+	FFLAGS="%{?opt_fc_fflags} $XFLAGS"
> # ${datadir}/openmpi will be used ONLY for the english help*.txt files
> 
> %build
>@@ -164,6 +169,7 @@
> sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@INCLUDEDIR@#'%{_includedir}'#g;s#@MODE@#'%{mode}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/%{name}-%{version}-%{opt_cc}-%{mode}.pc;
> sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@INCLUDEDIR@#'%{_includedir}'#g;s#@MODE@#'%{mode}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{mpidir}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE2 > ${RPM_BUILD_ROOT}/%{_libdir}/%{mpidir}/%{name}.module;
> 
>+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
> 
> %clean
> [ ! -z "${RPM_BUILD_ROOT}" ] && rm -rf ${RPM_BUILD_ROOT}
>@@ -243,8 +249,6 @@
> %{_includedir}/%{mpidir}/*
> %{_datadir}/%{mpidir}/man/man3/*
> %{_libdir}/%{mpidir}/*.so
>-%{_libdir}/%{mpidir}/*.la
>-%{_libdir}/%{mpidir}/%{name}/*.la
> %{_libdir}/pkgconfig/%{name}-%{version}-%{opt_cc}-%{mode}.pc
> %{_libdir}/%{mpidir}/*.mod
> %{_libdir}/%{mpidir}/*.module

Actions: View | Diff

Attachments on bug 246484: 158351