From 179cf98481ee6bc0d6e4ea2386a92cad943a9002 Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Tue, 21 Jul 2009 15:28:00 +0000 Subject: [PATCH] - Make sure all created dirs are owned (bz474677) - Fix loading of pkgconfig file (bz476844) - Resolve file conflict between us and libotf (bz496131) - Resolve dangling symlinks issue (bz496909) - Resolve unexpanded %{mode} issues (bz496911) - Restore -devel subpackage (bz499851) - Make getting the default openmpi devel environment easier (bz504357) - Make the -devel package pull in the base package (bz459458) - Make it easier to use alternative compilers to build package (bz246484) --- .cvsignore | 1 + openmpi.module.in | 4 ++-- openmpi.spec | 2 +- sources | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 05bba0f..272b532 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ openmpi-1.3.1.tar.bz2 +openmpi-1.3.3.tar.bz2 diff --git a/openmpi.module.in b/openmpi.module.in index 3e335b9..ebce5a8 100644 --- a/openmpi.module.in +++ b/openmpi.module.in @@ -4,5 +4,5 @@ # prepend-path PATH @LIBDIR@/@MPIDIR@/bin prepend-path LD_LIBRARY_PATH @LIBDIR@/@MPIDIR@/lib -setenv CFLAGS -I@LIBDIR@/@MPIDIR@/include @MODEFLAG@ -setenv LDFLAGS -L@LIBDIR@/@MPIDIR@/lib -lmpi +setenv CFLAGS "-I@LIBDIR@/@MPIDIR@/include @MODEFLAG@" +setenv LDFLAGS "-L@LIBDIR@/@MPIDIR@/lib -lmpi" diff --git a/openmpi.spec b/openmpi.spec index 09a601e..73c168c 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -27,7 +27,7 @@ Source0: http://www.open-mpi.org/software/ompi/v1.3/downloads/%{name}-%{version Source1: openmpi.pc.in Source2: openmpi.module.in BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gcc-gfortran, libtool, numactl-devel, valgrind +BuildRequires: gcc-gfortran, libtool, numactl-devel, valgrind-devel BuildRequires: libibverbs-devel, opensm-devel > 3.3.0 #%ifnarch ppc #BuildRequires: compat-dapl-devel diff --git a/sources b/sources index 4cbe69c..88986a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d759523b0752139872c534714d641d64 openmpi-1.3.1.tar.bz2 +f6cdc9c195daa8571b2e509e952d6755 openmpi-1.3.3.tar.bz2