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

- Update to 1.7 

- Rebase patch to handle removed components
This commit is contained in:
Orion Poplawski 2013-04-16 21:44:53 -06:00
parent 3421ba4a2d
commit 57a8b25828
4 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ openmpi-1.4.1-RH.tar.bz2
/openmpi-1.6.3-clean.tar.xz
/openmpi-1.6.4-clean.tar.bz2
/openmpi-1.6.4-clean.tar.xz
/openmpi-1.7-clean.tar.xz

47
openmpi-removed.patch
View File

@ -1,31 +1,32 @@
--- openmpi-1.5.5/configure.orig 2012-03-20 20:05:01.000000000 +0000
+++ openmpi-1.5.5/configure 2012-04-03 12:58:28.871397855 +0100
@@ -150328,10 +150328,6 @@
diff -up openmpi-1.7/configure.removed openmpi-1.7/configure
--- openmpi-1.7/configure.removed 2013-03-28 14:38:48.000000000 -0600
+++ openmpi-1.7/configure 2013-04-16 21:43:00.165986877 -0600
@@ -72177,9 +72177,6 @@ $as_echo "$compile_mode" >&6; }
# try to configure the component. pay no attention to
# --enable-dist, since we'll always have makefiles.
-ac_config_files="$ac_config_files opal/mca/backtrace/darwin/Makefile"
- ac_config_files="$ac_config_files opal/mca/backtrace/darwin/Makefile"
-
-
-
ac_config_files="$ac_config_files opal/mca/backtrace/execinfo/Makefile"
@@ -174422,7 +174418,6 @@
"opal/mca/hwloc/hwloc132/hwloc/src/Makefile") CONFIG_FILES="$CONFIG_FILES opal/mca/hwloc/hwloc132/hwloc/src/Makefile" ;;
"opal/mca/installdirs/config/install_dirs.h") CONFIG_FILES="$CONFIG_FILES opal/mca/installdirs/config/install_dirs.h" ;;
for ac_func in vm_read_overwrite
do :
ac_fn_c_check_func "$LINENO" "vm_read_overwrite" "ac_cv_func_vm_read_overwrite"
@@ -194246,7 +194243,6 @@ do
"opal/mca/backtrace/Makefile") CONFIG_FILES="$CONFIG_FILES opal/mca/backtrace/Makefile" ;;
- "opal/mca/backtrace/darwin/Makefile") CONFIG_FILES="$CONFIG_FILES opal/mca/backtrace/darwin/Makefile" ;;
"opal/mca/backtrace/execinfo/Makefile") CONFIG_FILES="$CONFIG_FILES opal/mca/backtrace/execinfo/Makefile" ;;
"opal/mca/backtrace/none/Makefile") CONFIG_FILES="$CONFIG_FILES opal/mca/backtrace/none/Makefile" ;;
"opal/mca/backtrace/printstack/Makefile") CONFIG_FILES="$CONFIG_FILES opal/mca/backtrace/printstack/Makefile" ;;
--- openmpi-1.5.5/Makefile.in.orig 2012-04-03 12:58:21.937232790 +0100
+++ openmpi-1.5.5/Makefile.in 2012-04-03 12:58:28.874397927 +0100
@@ -197,7 +197,6 @@
$(top_srcdir)/config/ext_no_configure_components.m4 \
$(top_srcdir)/config/mca_m4_config_include.m4 \
$(top_srcdir)/opal/mca/backtrace/configure.m4 \
"opal/mca/backtrace/execinfo/Makefile") CONFIG_FILES="$CONFIG_FILES opal/mca/backtrace/execinfo/Makefile" ;;
- "opal/mca/backtrace/darwin/Makefile") CONFIG_FILES="$CONFIG_FILES opal/mca/backtrace/darwin/Makefile" ;;
"opal/mca/backtrace/none/Makefile") CONFIG_FILES="$CONFIG_FILES opal/mca/backtrace/none/Makefile" ;;
"opal/mca/compress/Makefile") CONFIG_FILES="$CONFIG_FILES opal/mca/compress/Makefile" ;;
"opal/mca/compress/gzip/Makefile") CONFIG_FILES="$CONFIG_FILES opal/mca/compress/gzip/Makefile" ;;
diff -up openmpi-1.7/Makefile.in.removed openmpi-1.7/Makefile.in
--- openmpi-1.7/Makefile.in.removed 2013-03-28 14:34:54.000000000 -0600
+++ openmpi-1.7/Makefile.in 2013-04-16 21:42:00.734597103 -0600
@@ -226,7 +226,6 @@ am__aclocal_m4_deps = $(top_srcdir)/ompi
$(top_srcdir)/opal/mca/memory/configure.m4 \
$(top_srcdir)/opal/mca/pstat/configure.m4 \
$(top_srcdir)/opal/mca/timer/configure.m4 \
- $(top_srcdir)/opal/mca/backtrace/darwin/configure.m4 \
$(top_srcdir)/opal/mca/backtrace/execinfo/configure.m4 \
$(top_srcdir)/opal/mca/backtrace/none/configure.m4 \
$(top_srcdir)/opal/mca/backtrace/printstack/configure.m4 \
$(top_srcdir)/opal/mca/backtrace/execinfo/configure.m4 \

12
openmpi.spec
View File

@ -18,19 +18,19 @@
#global _cc_name_suffix -gcc
Name: openmpi%{?_cc_name_suffix}
Version: 1.6.4
Release: 2%{?dist}
Version: 1.7
Release: 1%{?dist}
Summary: Open Message Passing Interface
Group: Development/Libraries
License: BSD, MIT and Romio
URL: http://www.open-mpi.org/
# We can't use %{name} here because of _cc_name_suffix
#Source0: http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-%{version}.tar.bz2
Source0: http://www.open-mpi.org/software/ompi/v1.7/downloads/openmpi-%{version}.tar.bz2
# openmpi-%{version}-clean.tar.xz was generated by taking the upstream tarball
# and removing license-incompatible files:
# rm -r opal/mca/backtrace/darwin/MoreBacktrace
Source0: openmpi-%{version}-clean.tar.xz
#Source0: openmpi-%{version}-clean.tar.xz
Source1: openmpi.module.in
Source2: macros.openmpi
# Patch to handle removed items
@ -237,6 +237,10 @@ make check
%{_sysconfdir}/rpm/macros.%{namearch}
%changelog
* Tue Apr 16 2013 Orion Poplawski <orion@cora.nwra.com> 1.7-1
- Update to 1.7
- Rebase patch to handle removed components
* Sat Feb 23 2013 Orion Poplawski <orion@cora.nwra.com> 1.6.4-2
- Exclude libopen-trace.* from requires

2
sources
View File

@ -1 +1 @@
edee8f55e759294da58540d796a9fbd1 openmpi-1.6.4-clean.tar.xz
7e640f353a8a01b42abb17caa6e14ad0 openmpi-1.7-clean.tar.xz