rpms/openmpi
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Own and ship pkgconfig files, set PKG_CONFIG_PATH in modulefile (bug #1113626)

Browse Source 
- Drop old configure settings
This commit is contained in:
Orion Poplawski 2015-03-16 10:17:47 -06:00
parent 439780420b
commit e941c88664
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openmpi.module.in
View File

@ -5,6 +5,7 @@
conflict mpi conflict mpi
prepend-path PATH @LIBDIR@/bin prepend-path PATH @LIBDIR@/bin
prepend-path LD_LIBRARY_PATH @LIBDIR@/lib prepend-path LD_LIBRARY_PATH @LIBDIR@/lib
prepend-path PKG_CONFIG_PATH @LIBDIR@/lib/pkgconfig
prepend-path PYTHONPATH @PYSITEARCH@ prepend-path PYTHONPATH @PYSITEARCH@
prepend-path MANPATH @MANDIR@ prepend-path MANPATH @MANDIR@
setenv MPI_BIN @LIBDIR@/bin setenv MPI_BIN @LIBDIR@/bin

12
openmpi.spec
View File

@ -22,7 +22,7 @@
Name: openmpi%{?_cc_name_suffix} Name: openmpi%{?_cc_name_suffix}
Version: 1.8.4 Version: 1.8.4
Release: 3.20150228gitgd83fb30%{?dist} Release: 4.20150228gitgd83fb30%{?dist}
Summary: Open Message Passing Interface Summary: Open Message Passing Interface
Group: Development/Libraries Group: Development/Libraries
License: BSD, MIT and Romio License: BSD, MIT and Romio
@ -127,7 +127,6 @@ rm -r opal/libltdl
--sysconfdir=%{_sysconfdir}/%{namearch} \ --sysconfdir=%{_sysconfdir}/%{namearch} \
--disable-silent-rules \ --disable-silent-rules \
--enable-mpi-java \ --enable-mpi-java \
--enable-opal-multi-threads \
--with-libevent=/usr \ --with-libevent=/usr \
--with-verbs=/usr \ --with-verbs=/usr \
--with-sge \ --with-sge \
@ -141,14 +140,12 @@ rm -r opal/libltdl
LDFLAGS='%{__global_ldflags}' \ LDFLAGS='%{__global_ldflags}' \
CFLAGS="%{?opt_cflags} %{!?opt_cflags:$RPM_OPT_FLAGS}" \ CFLAGS="%{?opt_cflags} %{!?opt_cflags:$RPM_OPT_FLAGS}" \
CXXFLAGS="%{?opt_cxxflags} %{!?opt_cxxflags:$RPM_OPT_FLAGS}" \ CXXFLAGS="%{?opt_cxxflags} %{!?opt_cxxflags:$RPM_OPT_FLAGS}" \
FC=%{opt_fc} FCFLAGS="%{?opt_fcflags} %{!?opt_fcflags:$RPM_OPT_FLAGS}" \ FC=%{opt_fc} FCFLAGS="%{?opt_fcflags} %{!?opt_fcflags:$RPM_OPT_FLAGS}"
F77=%{opt_f77} FFLAGS="%{?opt_fflags} %{!?opt_fflags:$RPM_OPT_FLAGS}"
make %{?_smp_mflags} V=1 make %{?_smp_mflags} V=1
%install %install
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
rm -fr %{buildroot}%{_libdir}/%{name}/lib/pkgconfig
find %{buildroot}%{_libdir}/%{name}/lib -name \*.la | xargs rm find %{buildroot}%{_libdir}/%{name}/lib -name \*.la | xargs rm
find %{buildroot}%{_mandir}/%{namearch} -type f | xargs gzip -9 find %{buildroot}%{_mandir}/%{namearch} -type f | xargs gzip -9
ln -s mpicc.1.gz %{buildroot}%{_mandir}/%{namearch}/man1/mpiCC.1.gz ln -s mpicc.1.gz %{buildroot}%{_mandir}/%{namearch}/man1/mpiCC.1.gz
@ -222,6 +219,7 @@ make check
%{_libdir}/%{name}/lib/*.so %{_libdir}/%{name}/lib/*.so
%{_libdir}/%{name}/lib/lib*.a %{_libdir}/%{name}/lib/lib*.a
%{_libdir}/%{name}/lib/*.mod %{_libdir}/%{name}/lib/*.mod
%{_libdir}/%{name}/lib/pkgconfig/
%{_mandir}/%{namearch}/man1/mpi[cCf]* %{_mandir}/%{namearch}/man1/mpi[cCf]*
%{_mandir}/%{namearch}/man1/opal_* %{_mandir}/%{namearch}/man1/opal_*
%{_mandir}/%{namearch}/man3/* %{_mandir}/%{namearch}/man3/*
@ -243,6 +241,10 @@ make check
%changelog %changelog
* Mon Mar 16 2015 Orion Poplawski <orion@cora.nwra.com> 1.8.4-4.99.20150228gitgd83fb30
- Own and ship pkgconfig files, set PKG_CONFIG_PATH in modulefile (bug #1113626)
- Drop old configure settings
* Wed Mar 4 2015 Orion Poplawski <orion@cora.nwra.com> 1.8.4-3.99.20150228gitgd83fb30 * Wed Mar 4 2015 Orion Poplawski <orion@cora.nwra.com> 1.8.4-3.99.20150228gitgd83fb30
- Update to 1.8.4.99 snapshot - Update to 1.8.4.99 snapshot