rpms
/
openmpi
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Fix pkgconfig file substitution 

- Bump version so we are later than the equivalent version from Red Hat
    Enterprise Linux
This commit is contained in:
Doug Ledford 2010-01-15 14:30:56 +00:00
parent a2a10c9385
commit 41f501523a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openmpi.pc.in
View File

@ -3,5 +3,5 @@ Name: @NAME@
Description: Open Message Passing Interface headers and libraries
URL: http://www.open-mpi.org/
Version: @VERSION@-@CC@
Libs: -L@LIBDIR@/@MPIDIR@/lib -lmpi
Cflags: -I@LIBDIR@/@MPIDIR@/include @MODEFLAG@
Libs: -L@LIBDIR@ -lmpi
Cflags: -I@INCDIR@ @MODEFLAG@

11
openmpi.spec
View File

@ -19,7 +19,7 @@
Name: openmpi%{?_cc_name_suffix}
Version: 1.4
Release: 1%{?dist}
Release: 3%{?dist}
Summary: Open Message Passing Interface
Group: Development/Libraries
License: BSD
@ -32,7 +32,7 @@ Source3: macros.openmpi
Patch0: openmpi-changeset_r22324.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-gfortran, libtool, numactl-devel, valgrind-devel
BuildRequires: libibverbs-devel, opensm-devel > 3.3.0
BuildRequires: libibverbs-devel >= 1.1.2, opensm-devel > 3.3.0
BuildRequires: librdmacm librdmacm-devel libibcm libibcm-devel
#%ifnarch ppc
#BuildRequires: compat-dapl-devel
@ -146,7 +146,7 @@ mkdir %{buildroot}%{_mandir}/%{namearch}/man{2,4,5,6,8,9,n}
# Make the pkgconfig file
mkdir -p %{buildroot}%{_libdir}/pkgconfig
sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{name}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > %{buildroot}/%{_libdir}/pkgconfig/%{name}.pc
sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}/%{name}/lib'#g;s#@CC@#'%{opt_cc}'#g;s#@INCDIR@#'%{_includedir}/%{namearch}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > %{buildroot}/%{_libdir}/pkgconfig/%{name}.pc
# Make the environment-modules file
mkdir -p %{buildroot}%{_sysconfdir}/modulefiles
# Since we're doing our own substitution here, use our own definitions.
@ -216,6 +216,11 @@ rm -rf %{buildroot}
%{_sysconfdir}/rpm/macros.%{namearch}
%changelog
* Fri Jan 15 2010 Doug Ledford <dledford@redhat.com> - 1.4-3
- Fix pkgconfig file substitution
- Bump version so we are later than the equivalent version from Red Hat
Enterprise Linux
* Wed Jan 13 2010 Doug Ledford <dledford@redhat.com> - 1.4-1
- Update to latest upstream stable version
- Add support for libibcm usage