[packages/mpich] - new URLs, updated to 3.1.3 - removed obsolete patches - added sh patch (fixes build with some non-
qboosh
qboosh at pld-linux.org
Sun Nov 23 18:26:31 CET 2014
commit dc8c0b9437f4a8ead9115a4be7d1917d81ff55d4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Nov 23 18:27:12 2014 +0100
- new URLs, updated to 3.1.3
- removed obsolete patches
- added sh patch (fixes build with some non-bash POSIX shells)
- added opalink patch (fixes linking with openpa in system dir)
mpich-1.2.5-oM.patch | 166 ----------------------------------------
mpich-c++.patch | 52 -------------
mpich-fuckssh.patch | 48 ------------
mpich-opalink.patch | 52 +++++++++++++
mpich-opt.patch | 132 --------------------------------
mpich-sh.patch | 13 ++++
mpich.spec | 210 ++++++++++++++++++++++++++++++++-------------------
7 files changed, 196 insertions(+), 477 deletions(-)
---
diff --git a/mpich.spec b/mpich.spec
index 9ac47a9..d24555b 100644
--- a/mpich.spec
+++ b/mpich.spec
@@ -1,94 +1,105 @@
Summary: Portable MPI Model Implementation
Summary(pl.UTF-8): Przenośna implementacja standardu MPI
Name: mpich
-Version: 1.2.7p1
-Release: 4
-License: Open source (MPICH), BSD-like (MPI-2-C++)
+Version: 3.1.3
+Release: 1
+License: BSD-like
Group: Development/Libraries
-Source0: ftp://ftp.mcs.anl.gov/pub/mpi/%{name}-%{version}.tar.bz2
-# Source0-md5: 4fc0f20bddfbd5061a11047cf2d17d31
-Patch0: %{name}-fuckssh.patch
-Patch1: %{name}-opt.patch
-Patch2: http://squishy.monkeysoft.net/mpich/%{name}-1.2.5-oM.patch
-Patch3: mpich-c++.patch
-URL: http://www-unix.mcs.anl.gov/mpi/
-BuildRequires: gcc-g77
+Source0: http://www.mpich.org/static/downloads/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 93cb17f91ac758cbf9174ecb03563778
+Patch0: %{name}-sh.patch
+Patch1: %{name}-opalink.patch
+URL: http://www.mpich.org/
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1:1.12.3
+BuildRequires: blcr-devel
+BuildRequires: ftb-devel
+BuildRequires: gcc-fortran
+BuildRequires: hwloc-devel >= 1.9.0
BuildRequires: libstdc++-devel
-BuildRequires: sed >= 4.0
+BuildRequires: libtool >= 2:2
+BuildRequires: openpa-devel
+Requires: hwloc-libs >= 1.9.0
Provides: mpi
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-MPICH is an open-source, portable implementation of the
-Message-Passing Interface Standard. It contains a complete
-implementation of version 1.2 of the MPI Standard and also significant
-parts of MPI-2, particularly in the area of parallel I/O.
+MPICH is a high-performance and widely portable implementation of the
+MPI-3.0 standard from the Argonne National Laboratory. This release
+has all MPI 3.0 functions and features required by the standard with
+the exception of support for the "external32" portable I/O format and
+user-defined data representations for I/O.
+
+This package contains MPICH shared libraries and runtime utilities,
+including Hydra PM.
%description -l pl.UTF-8
-MPICH jest wolnodostępną implementacją standardu MPI (Message-Passing
-Interface). Zawiera pełną implementację wersji MPI 1.2 oraz znaczne
-części wersji MPI-2, szczególnie w zakresie równoległej komunikacji.
+MPICH to wysoko wydajna i przenośna implementacja standardu MPI-3.0
+pochodząca z Argonne National Laboratory. To wydanie zawiera całą
+funkcjonalność i możliwości MPI 3.0 wymagane przez standard z
+wyjątkiem obsługi przenośnego formatu we-wy "external32" oraz
+definiowanych przez użytkownika reprezentacji danych dla we/wy.
+
+Ten pakiet zawiera biblioteki współdzielone MPICH oraz narzędzia
+uruchomieniowe, w tym Hydra PM.
+
+%package devel
+Summary: MPICH header files and development tools
+Summary(pl.UTF-8): Pliki nagłówkowe oraz narzędzia programistyczne MPICH
+Group: Development
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+MPICH header files and development tools.
+
+%description devel
+Pliki nagłówkowe oraz narzędzia programistyczne MPICH.
+
+%package static
+Summary: MPICH static libraries
+Summary(pl.UTF-8): Biblioteki statyczne MPICH
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+MPICH static libraries.
+
+%description static -l pl.UTF-8
+Biblioteki statyczne MPICH.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-sed -i -e 's|RCPCOMMAND-rcp|RCPCOMMAND-scp|' mpid/ch_p4/mpirun.ch_p4.in
%build
-RSHCOMMAND=/usr/bin/ssh ; export RSHCOMMAND
-RCPCOMMAND=/usr/bin/scp ; export RCPCOMMAND
-# note: can't run autoconf - we must patch configure not only configure.in
-# also, don't change it to %%configure - it won't work
-# no configure options for sysconfdir and messagecat_dir :/
-sysconfdir=%{_sysconfdir} \
-messagecat_dir=%{_libdir} \
-./configure \
- --prefix=%{_prefix} \
- --exec_prefix=%{_prefix} \
- --includedir=%{_includedir} \
- --sharedlib=%{_libdir} \
- --libdir=%{_libdir} \
- --datadir=%{_datadir}/%{name} \
- --bindir=%{_bindir} \
- --sbindir=%{_sbindir} \
- --mandir=%{_mandir} \
- --docdir=%{_docdir} \
- -opt="%{rpmcflags} -fPIC -DPIC" \
- -fc=gfortran
-
-%{__make} -j1
+%{__libtoolize}
+%{__aclocal} -I confdb
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+ --disable-silent-rules \
+ --with-hwloc-prefix=system \
+ --with-openpa-prefix=system
+
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-# really awful
-DESTDIR=$RPM_BUILD_ROOT ; export DESTDIR
-%{__make} -j1 install
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-mv -f $RPM_BUILD_ROOT%{_prefix}/examples/* \
- $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+%{__rm} $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/{cpi,cpi.o,examples.sln}
-(cd $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-rm -f mpirun MPI-2-C++/mpirun
-ln -sf %{_bindir}/mpirun mpirun
-ln -sf %{_bindir}/mpirun MPI-2-C++/mpirun
-)
+# see openpa.spec
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libopa.so
-# argh... where came that 4 from???
-for f in $RPM_BUILD_ROOT%{_mandir}/man4/*.4 ; do
- mv -f "$f" $RPM_BUILD_ROOT%{_mandir}/man3/`basename "$f" .4`.3
-done
-
-for f in HISTORY LICENSE README TODO ; do
- mv -f MPI-2-C++/$f $f.MPI-2-C++
-done
-
-rm -rf $RPM_BUILD_ROOT%{_prefix}/{doc,logfiles,www}
+# PDFs packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/mpich
%clean
rm -rf $RPM_BUILD_ROOT
@@ -98,18 +109,59 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc doc/*.ps* COPYRIGHT README KnownBugs
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so*
-%{_libdir}/lib*.a
-%{_libdir}/mpe_prof.o
-%{_sysconfdir}/mpichversion.c
-%{_sysconfdir}/mpichconf.h.dat
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mpi*.conf
-%{_includedir}/*.h
-%{_includedir}/mpi2c++
-%{_mandir}/man1/*
-%{_mandir}/man3/*
-%{_datadir}/mpich
+%doc CHANGES COPYRIGHT README README.envvar RELEASE_NOTES doc/{installguide/install.pdf,logging/logging.pdf,userguide/user.pdf}
+%attr(755,root,root) %{_bindir}/hydra_nameserver
+%attr(755,root,root) %{_bindir}/hydra_persist
+%attr(755,root,root) %{_bindir}/hydra_pmi_proxy
+%attr(755,root,root) %{_bindir}/mpichversion
+%attr(755,root,root) %{_bindir}/mpiexec
+%attr(755,root,root) %{_bindir}/mpiexec.hydra
+%attr(755,root,root) %{_bindir}/mpirun
+%attr(755,root,root) %{_bindir}/mpivars
+%attr(755,root,root) %{_bindir}/parkill
+%attr(755,root,root) %{_libdir}/libmpi.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmpi.so.12
+%attr(755,root,root) %{_libdir}/libmpicxx.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmpicxx.so.12
+%attr(755,root,root) %{_libdir}/libmpifort.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmpifort.so.12
+%{_mandir}/man1/hydra_nameserver.1*
+%{_mandir}/man1/hydra_persist.1*
+%{_mandir}/man1/hydra_pmi_proxy.1*
+%{_mandir}/man1/mpiexec.1*
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/mpic++
+%attr(755,root,root) %{_bindir}/mpicc
+%attr(755,root,root) %{_bindir}/mpicxx
+%attr(755,root,root) %{_bindir}/mpif77
+%attr(755,root,root) %{_bindir}/mpif90
+%attr(755,root,root) %{_bindir}/mpifort
+%attr(755,root,root) %{_libdir}/libmpi.so
+%attr(755,root,root) %{_libdir}/libmpicxx.so
+%attr(755,root,root) %{_libdir}/libmpifort.so
+%attr(755,root,root) %{_libdir}/libfmpich.so
+%attr(755,root,root) %{_libdir}/libmpich.so
+%attr(755,root,root) %{_libdir}/libmpichcxx.so
+%attr(755,root,root) %{_libdir}/libmpichf90.so
+%attr(755,root,root) %{_libdir}/libmpl.so
+%{_libdir}/libmpi.la
+%{_libdir}/libmpicxx.la
+%{_libdir}/libmpifort.la
+%{_includedir}/mpi*.h
+%{_includedir}/mpi*.mod
+%{_pkgconfigdir}/mpich.pc
+%{_mandir}/man1/mpicc.1*
+%{_mandir}/man1/mpicxx.1*
+%{_mandir}/man1/mpif77.1*
+%{_mandir}/man1/mpifort.1*
+%{_mandir}/man3/MPIX_*.3*
+%{_mandir}/man3/MPI_*.3*
%{_examplesdir}/%{name}-%{version}
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libmpi.a
+%{_libdir}/libmpicxx.a
+%{_libdir}/libmpifort.a
diff --git a/mpich-1.2.5-oM.patch b/mpich-1.2.5-oM.patch
deleted file mode 100644
index 09573da..0000000
--- a/mpich-1.2.5-oM.patch
+++ /dev/null
@@ -1,166 +0,0 @@
---- mpich-1.2.5-orig/mpid/ch_p4/p4/lib/p4_sock_cr.c Mon Jan 13 10:23:33 2003
-+++ mpich-1.2.5/mpid/ch_p4/p4/lib/p4_sock_cr.c Fri May 2 17:38:15 2003
-@@ -424,19 +424,69 @@ int net_create_slave( int serv_port, int
- child_pid = rc = fork_p4();
- if (rc == 0)
- {
-+
-+
-+/* #define USE_ONLY_MOSRUN */
-+#ifdef USE_ONLY_MOSRUN
-+ char local_cmd[1024] = "mosrun";
-+ char * mos_args;
-+ mos_args = getenv("MOSRUN_ARGS");
-+ if(!mos_args) mos_args="-l";
-+
-+ p4_dprintfl( 80, "Using mosrun instead of rsh\n" );
-+
-+ /* TODO: Perhaps there's a nicer way than a bunch
-+ of strcat's ? */
-+ strcat(local_cmd, " ");
-+ strcat(local_cmd, mos_args);
-+ strcat(local_cmd, " ");
-+ strcat(local_cmd, pgm);
-+ strcat(local_cmd, " ");
-+ strcat(local_cmd, myhostname);
-+ strcat(local_cmd, " ");
-+ strcat(local_cmd, serv_port_c);
-+ strcat(local_cmd, " ");
-+ strcat(local_cmd, am_slave_c);
-+ strcat(local_cmd, " ");
-+ strcat(local_cmd, "-p4yourname");
-+ strcat(local_cmd, " ");
-+ strcat(local_cmd, host);
-+ strcat(local_cmd, " ");
-+ strcat(local_cmd, "-p4rmrank");
-+ strcat(local_cmd, " ");
-+ strcat(local_cmd, rm_rank_str);
-+
-+ rc = execlp("bash", "bash", "-c", local_cmd, NULL);
-+
-+
-+#else /* !USE_ONLY_MOSRUN */
- /* define SHORT_CIRCUIT_LOCALHOST */
--/* This doesn't work yet. redirection of stdin/out/error are undoubtedly
-- part of the problem. We'll leave this for the next release */
-+/* this is untested... Good luck! */
- #ifdef SHORT_CIRCUIT_LOCALHOST
- /* If host is localhost or myhost, then we don't need to run
-- remote shell (do we? what about stdin/out/err?) */
-+ remote shell */
-+ char local_cmd[1024];
- if (strcmp( host, "localhost" ) == 0 ||
- strcmp( myhostname, host ) == 0) {
- p4_dprintfl( 80, "Not using rsh to localhost\n" );
-- rc = execlp(pgm, pgm,
-- myhostname, serv_port_c, am_slave_c,
-- "-p4yourname", host, "-p4rmrank", rm_rank_str,
-- NULL);
-+
-+ strcpy(local_cmd, pgm);
-+ strcat(local_cmd, " ");
-+ strcat(local_cmd, myhostname);
-+ strcat(local_cmd, " ");
-+ strcat(local_cmd, serv_port_c);
-+ strcat(local_cmd, " ");
-+ strcat(local_cmd, am_slave_c);
-+ strcat(local_cmd, " ");
-+ strcat(local_cmd, "-p4yourname");
-+ strcat(local_cmd, " ");
-+ strcat(local_cmd, host);
-+ strcat(local_cmd, " ");
-+ strcat(local_cmd, "-p4rmrank");
-+ strcat(local_cmd, " ");
-+ strcat(local_cmd, rm_rank_str);
-+
-+ rc = execlp("bash", "bash", "-c", local_cmd, NULL);
- }
- else {
- rc = execlp(remote_shell, remote_shell,
-@@ -616,6 +666,7 @@ int net_create_slave( int serv_port, int
- NULL);
- #endif /* RSH_NEEDS_OPTS */
- #endif /* Short_circuit_localhost */
-+#endif /* USE_ONLY_MOSRUN */
- /* host,"-n","cluster","5",pgm,myhostname,serv_port_c,0); for butterfly */
- if (rc < 0) {
- /* Trap common user errors and generate a more
---- mpich-1.2.5-orig/configure Mon Jan 13 14:34:56 2003
-+++ mpich-1.2.5/configure Fri May 2 17:15:29 2003
-@@ -1123,6 +1123,10 @@ do
- rshnol=1
- ;;
-
-+ -use_only_mosrun)
-+ use_only_mosrun=1
-+ ;;
-+
- -lib=* | --lib=*)
- package="`echo $arg|sed 's/-*lib=//'`"
- USERLIB="$package" ;;
---- mpich-1.2.5-orig/configure.in Mon Jan 13 14:34:57 2003
-+++ mpich-1.2.5/configure.in Fri May 2 17:22:05 2003
-@@ -1132,6 +1132,10 @@ do
- rshnol=1
- ;;
-
-+ -use_only_mosrun)
-+ use_only_mosrun=1
-+ ;;
-+
- -lib=* | --lib=*)
- package="`echo $arg|sed 's/-*lib=//'`"
- USERLIB="$package" ;;
---- mpich-1.2.5-orig/mpid/ch_p4/setup_ch_p4 Fri Oct 4 07:30:41 2002
-+++ mpich-1.2.5/mpid/ch_p4/setup_ch_p4 Fri May 2 17:17:10 2003
-@@ -166,6 +166,9 @@ fi
- if test -n "$rshnol" ; then
- otherargs="$otherargs -rshnol"
- fi
-+if test -n "$use_only_mosrun" ; then
-+ otherargs="$otherargs -use_only_mosrun"
-+fi
- if test -n "$DLAST" ; then
- otherargs="$otherargs $DLAST"
- fi
---- mpich-1.2.5-orig/mpid/ch_p4/p4/configure.in Sun Jun 9 09:47:40 2002
-+++ mpich-1.2.5/mpid/ch_p4/p4/configure.in Fri May 2 17:20:05 2003
-@@ -121,6 +121,9 @@ case $arg in
- -rshnol)
- RSHNOL=1
- ;;
-+ -use_only_mosrun)
-+ USE_ONLY_MOSRUN=1
-+ ;;
- -cflags=*)
- USER_CFLAGS="`echo A$arg|sed 's/A-*cflags=//'`"
- ;;
---- mpich-1.2.5-orig/mpid/ch_p4/p4/configure Tue Jun 11 07:04:29 2002
-+++ mpich-1.2.5/mpid/ch_p4/p4/configure Fri May 2 17:18:07 2003
-@@ -113,6 +113,9 @@ case $arg in
- -rshnol)
- RSHNOL=1
- ;;
-+ -use_only_mosrun)
-+ USE_ONLY_MOSRUN=1
-+ ;;
- -cflags=*)
- USER_CFLAGS="`echo A$arg|sed 's/A-*cflags=//'`"
- ;;
-@@ -10301,6 +10304,16 @@ test -n "$verbose" && \
- echo " defining RSH_HAS_NO_L"
- echo "#define" RSH_HAS_NO_L 1 >> confdefs.h
- DEFS="$DEFS -DRSH_HAS_NO_L=1"
-+}
-+
-+fi
-+if test -n "$USE_ONLY_MOSRUN" ; then
-+
-+{
-+test -n "$verbose" && \
-+echo " defining USE_ONLY_MOSRUN"
-+echo "#define" USE_ONLY_MOSRUN 1 >> confdefs.h
-+DEFS="$DEFS -DUSE_ONLY_MOSRUN=1"
- }
-
- fi
diff --git a/mpich-c++.patch b/mpich-c++.patch
deleted file mode 100644
index b271575..0000000
--- a/mpich-c++.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- mpich-1.2.7p1/configure.in~ 2012-04-04 13:02:28.073692580 +0200
-+++ mpich-1.2.7p1/configure.in 2012-04-04 13:55:29.800502795 +0200
-@@ -1804,7 +1804,7 @@
- # (the autoconf tests are too GNU-centric)
- if test -n "$GXXTRIAL" ; then
- cat > conftest.cc <<EOF
--#include <iostream.h>
-+#include <iostream>
- EOF
- rm -f conftest.out
- if $GXXTRIAL $CXXFLAGS -c conftest.cc >conftest.out 2>&1 ; then
-@@ -1845,10 +1845,10 @@
- # used above is used only to *find* a compiler; if the user selected
- # a compiler that doesn't work, we still need the test.
- if test -n "$CPP_COMPILER" ; then
-- AC_MSG_CHECKING([whether selected C++ compiler can compile iostream.h])
-+ AC_MSG_CHECKING([whether selected C++ compiler can compile iostream])
- rm -f conftest*
- cat > conftest.cc <<EOF
--#include <iostream.h>
-+#include <iostream>
- EOF
- if $CPP_COMPILER $CXXFLAGS -c conftest.cc>conftest.out 2>&1 ; then
- AC_MSG_RESULT(yes)
---- mpich-1.2.7p1/configure~ 2012-04-04 13:56:35.643839099 +0200
-+++ mpich-1.2.7p1/configure 2012-04-04 13:57:10.133840656 +0200
-@@ -2748,7 +2748,7 @@
- # (the autoconf tests are too GNU-centric)
- if test -n "$GXXTRIAL" ; then
- cat > conftest.cc <<EOF
--#include <iostream.h>
-+#include <iostream>
- EOF
- rm -f conftest.out
- if $GXXTRIAL $CXXFLAGS -c conftest.cc >conftest.out 2>&1 ; then
-@@ -2844,13 +2844,13 @@
-
- fi
- if test -z "$ac_echo_test" -a 1 = 1 ; then
--echo $ac_n "checking whether selected C++ compiler can compile iostream.h""... $ac_c"
-+echo $ac_n "checking whether selected C++ compiler can compile iostream""... $ac_c"
- else
--echo $ac_n "checking whether selected C++ compiler can compile iostream.h""... $ac_c" 1>&1
-+echo $ac_n "checking whether selected C++ compiler can compile iostream""... $ac_c" 1>&1
- fi
- rm -f conftest*
- cat > conftest.cc <<EOF
--#include <iostream.h>
-+#include <iostream>
- EOF
- if $CPP_COMPILER $CXXFLAGS -c conftest.cc>conftest.out 2>&1 ; then
- if test -z "$ac_echo_test" -a 1 = 1 ; then
diff --git a/mpich-fuckssh.patch b/mpich-fuckssh.patch
deleted file mode 100644
index 3da5232..0000000
--- a/mpich-fuckssh.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- mpich-1.2.5.3/mpid/ch_p4/configure.orig 2003-08-12 15:19:25.000000000 +0200
-+++ mpich-1.2.5.3/mpid/ch_p4/configure 2004-07-04 12:36:33.739998728 +0200
-@@ -1186,22 +1186,8 @@
- fi
-
- if test -n "$RSHCOMMAND" ; then
-- echo $ac_n "checking whether $RSHCOMMAND works""... $ac_c" 1>&1
--echo "configure:1191: checking whether $RSHCOMMAND works" >&2
-- output=`$RSHCOMMAND $machine -n true 2>&1 </dev/null`
-- if test -n "$output" ; then
-- echo "$ac_t""no" 1>&1
-- echo "Errors while trying to run true on $machine with $program"
-- echo "$output"
-- RSHCOMMAND=""
-- # HORRIBLE, TERRIBLE BUG in AUTOCONF!!!
-- # It is determined to INCORRECTLY remember some results,
-- # while forgetting others (like "cross-compiling")
-- unset ac_cv_path_RSHCOMMAND
-- else
- echo "$ac_t""yes" 1>&1
- break
-- fi
- fi
- done
- # Check ssh with special options to avoid user prompting which causes the
-@@ -1243,22 +1229,7 @@
- fi
-
- if test -n "$RSHCOMMAND" ; then
-- echo $ac_n "checking whether $RSHCOMMAND works""... $ac_c" 1>&1
--echo "configure:1248: checking whether $RSHCOMMAND works" >&2
-- output=`$RSHCOMMAND -o "StrictHostKeyChecking no" \
-- -o "BatchMode yes" $machine -n true 2>&1 </dev/null`
-- if test $? -ne 0 ; then
-- echo "$ac_t""no" 1>&1
-- echo "Errors while trying to run true on $machine with ssh"
-- echo "$output"
-- RSHCOMMAND=""
-- # HORRIBLE, TERRIBLE BUG in AUTOCONF!!!
-- # It is determined to INCORRECTLY remember some results,
-- # while forgetting others (like "cross-compiling")
-- unset ac_cv_path_RSHCOMMAND
-- else
- echo "$ac_t""yes" 1>&1
-- fi
- fi
- fi
- fi
diff --git a/mpich-opalink.patch b/mpich-opalink.patch
new file mode 100644
index 0000000..ee5a567
--- /dev/null
+++ b/mpich-opalink.patch
@@ -0,0 +1,52 @@
+--- mpich-3.1.3/configure.ac.orig 2014-11-22 21:36:39.473469954 +0100
++++ mpich-3.1.3/configure.ac 2014-11-22 22:20:53.770025233 +0100
+@@ -1212,6 +1212,8 @@
+ AC_SUBST([opasrcdir])
+ opalibdir=""
+ AC_SUBST([opalibdir])
++opalibopt=""
++AC_SUBST([opalibopt])
+ opalib=""
+ AC_SUBST([opalib])
+
+@@ -1219,6 +1221,7 @@
+ if test -e "${use_top_srcdir}/src/openpa" ; then
+ opasrcdir="${master_top_builddir}/src/openpa"
+ opalibdir="${master_top_builddir}/src/openpa/src"
++ opalibopt="-L${master_top_builddir}/src/openpa/src"
+ opalib="${master_top_builddir}/src/openpa/src/lib${OPALIBNAME}.la"
+ PAC_APPEND_FLAG([-I${use_top_srcdir}/src/openpa/src],[CPPFLAGS])
+ PAC_APPEND_FLAG([-I${master_top_builddir}/src/openpa/src],[CPPFLAGS])
+@@ -1255,8 +1258,10 @@
+ if test -d ${with_openpa_prefix}/lib64 ; then
+ PAC_APPEND_FLAG([-L${with_openpa_prefix}/lib64],[WRAPPER_LDFLAGS])
+ opalibdir="${with_openpa_prefix}/lib64"
++ opalibopt="-L${with_openpa_prefix}/lib64"
+ else
+ opalibdir="${with_openpa_prefix}/lib"
++ opalibopt="-L${with_openpa_prefix}/lib"
+ fi
+ PAC_APPEND_FLAG([-L${with_openpa_prefix}/lib],[WRAPPER_LDFLAGS])
+ fi
+--- mpich-3.1.3/Makefile.am.orig 2014-10-07 23:50:23.000000000 +0200
++++ mpich-3.1.3/Makefile.am 2014-11-22 22:21:28.990023755 +0100
+@@ -48,7 +48,7 @@
+ errnames_txt_files =
+
+ external_subdirs = @mplsrcdir@ @opasrcdir@
+-external_ldflags = -L at mpllibdir@ -L at opalibdir@
++external_ldflags = -L at mpllibdir@ @opalibopt@
+ external_libs = @EXTERNAL_LIBS@
+ mpi_convenience_libs =
+ pmpi_convenience_libs = @mpllib@ @opalib@
+--- mpich-3.1.3/examples/Makefile.am.orig 2014-10-07 23:50:23.000000000 +0200
++++ mpich-3.1.3/examples/Makefile.am 2014-11-22 23:06:01.823244920 +0100
+@@ -36,7 +36,7 @@
+ # the make-time instances of libpmpi.la and libmpi.la live here
+ AM_LDFLAGS += -L../lib
+ # the make-time instances of libmpl.la and libopa.la live here
+-AM_LDFLAGS += -L at mpllibdir@ -L at opalibdir@
++AM_LDFLAGS += -L at mpllibdir@ @opalibopt@
+
+ # Wrapper LDFLAGS need to be added at the end to make sure we link
+ # with the libraries we just built, and not any previously installed
diff --git a/mpich-opt.patch b/mpich-opt.patch
deleted file mode 100644
index a594a11..0000000
--- a/mpich-opt.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- mpich-1.2.1/mpid/ch_p4/Makefile.in.orig Wed Aug 16 21:22:39 2000
-+++ mpich-1.2.1/mpid/ch_p4/Makefile.in Tue May 29 22:11:11 2001
-@@ -31,7 +31,7 @@
- # found in, not the directory where the compiler is running (!)
- # Trailing / causes problems for some versions of gcc (was -I./)
- # Was -I../.. -I../ch_p4
--CFLAGS = @CFLAGS@ -I${top_srcdir}/mpid/ch2 -I${srcdir} -I${top_srcdir}/mpid/util -Ip4 -Ip4/include
-+CFLAGS = @CFLAGS@ ${OPTFLAGS} -I${top_srcdir}/mpid/ch2 -I${srcdir} -I${top_srcdir}/mpid/util -Ip4 -Ip4/include
-
- # See mpid/ch_adi2/Makefile.in for a full list
- SOURCE = adi2recv.c adi2send.c adi2init.c adi2probe.c adi2ssend.c \
---- mpich-1.2.5/src/env/Makefile.in.orig Tue Sep 5 16:23:17 2000
-+++ mpich-1.2.5/src/env/Makefile.in Tue May 29 22:28:29 2001
-@@ -116,10 +116,10 @@
- # the MPI libraries will work
- msgqdllloc.o: ${top_srcdir}/src/env/msgqdllloc.c
- @if test -n "@SHAREDKIND_FOR_TV@" -a "@SHAREDKIND_FOR_TV@" != "ignore" ; then \
-- ${CC} ${DEFS} ${CFLAGS} -c @CC_SHARED_OPT_FOR_TV@ \
-+ ${CC} ${DEFS} ${CFLAGS} ${OPTFLAGSC} ${OPTFLAGS} -c @CC_SHARED_OPT_FOR_TV@ \
- -DMPICH_INFODLL_LOC='"@libdir@/libtvmpich.so"' ${top_srcdir}/src/env/msgqdllloc.c ; \
- else \
-- ${CC} ${DEFS} ${CFLAGS} -c ${top_srcdir}/src/env/msgqdllloc.c ; \
-+ ${CC} ${DEFS} ${CFLAGS} ${OPTFLAGSC} ${OPTFLAGS} -c ${top_srcdir}/src/env/msgqdllloc.c ; \
- fi
-
- .c.o:
---- mpich-1.2.5/src/infoexport/Makefile.in.orig Fri Jan 14 21:58:04 2000
-+++ mpich-1.2.5/src/infoexport/Makefile.in Tue May 29 22:50:47 2001
-@@ -7,7 +7,7 @@
-
- # Define FOR_MPI2=1 to enable some MPI-2 support
- DEFS = @DEFS@ ${MPIPROFILE} -I. -I${srcdir} @mpich_includes@ -DFOR_MPI2=0
--CFLAGS = -g @CC_SHARED_OPT_FOR_TV@ @CFLAGS@
-+CFLAGS = @OPTFLAGS@ @CC_SHARED_OPT_FOR_TV@ @CFLAGS@
-
- @VPATH@
-
---- mpich-1.2.1/src/fortran/configure.in.orig Tue Aug 29 23:53:00 2000
-+++ mpich-1.2.1/src/fortran/configure.in Tue May 29 22:56:52 2001
-@@ -21,7 +21,7 @@
- AC_SUBST(COPTIONS)
- AC_ARG_ENABLE(strict,
- [--enable-strict - Turn on strict compilation testing when using gcc],
--COPTIONS="${COPTIONS} -Wall -O -Wstrict-prototypes -Wmissing-prototypes -DGCC_WALL")
-+COPTIONS="${COPTIONS} -Wall -Wstrict-prototypes -Wmissing-prototypes -DGCC_WALL")
-
- AC_ARG_ENABLE(echo,
- [--enable-echo - Turn on echoing from within the configure script],
---- mpich-1.2.7p1/src/fortran/configure.orig 2005-11-04 18:52:34.000000000 +0100
-+++ mpich-1.2.7p1/src/fortran/configure 2007-04-09 16:22:50.375171787 +0200
-@@ -1498,7 +1498,7 @@
- # Check whether --enable-strict or --disable-strict was given.
- if test "${enable_strict+set}" = set; then
- enableval="$enable_strict"
-- COPTIONS="${COPTIONS} -Wall -O -Wstrict-prototypes -Wmissing-prototypes -DGCC_WALL"
-+ COPTIONS="${COPTIONS} -Wall -Wstrict-prototypes -Wmissing-prototypes -DGCC_WALL"
- fi;
-
- # Check whether --enable-echo or --disable-echo was given.
---- mpich-1.2.5.3/configure.in.orig 2004-04-05 15:48:47.000000000 +0200
-+++ mpich-1.2.5.3/configure.in 2004-07-04 13:39:28.170198120 +0200
-@@ -3510,6 +3510,8 @@
- export TESTCC ;\
- export TESTF77 ;\
- export TESTF90 ;\
-+ COPTIONS="$OPTFLAGSC $OPTFLAGS"; export COPTIONS;\
-+ FOPTIONS="$OPTFLAGSF $OPTFLAGS"; export FOPTIONS;\
- export mpich_includes ;\
- export LIB_PATH ;\
- export BASE_LIB_LIST ;\
-@@ -3684,6 +3686,7 @@
- export FROM_MPICH;\
- export int_len ; export void_star_len ; export OFFSET_KIND ; \
- export long_long_len ; \
-+ CFLAGS="$OPTFLAGSC $OPTFLAGS" ; export CFLAGS ; \
- "${top_srcdir}/romio/configure" $ROMIO_ARGS $ROMIO_FILE_SYSTEM \
- --with-mpi=mpich $romio_config_args $enable_args $with_args )
- rc=$?
-@@ -3773,6 +3776,7 @@
- --prefix=${prefix} $enable_args $with_args \
- --libdir=${libdir} --bindir=${bindir} \
- --includedir=${includedir} \
-+ --with-cflags="$OPTFLAGSC $OPTFLAGS" \
- $MPE_ARGS )
- if test $? = 0 ; then
- echo "Done configuring MPE Profiling Libraries" ; echo
---- mpich-1.2.5.3/configure.orig 2004-04-07 19:26:01.000000000 +0200
-+++ mpich-1.2.5.3/configure 2004-07-04 13:40:20.934176776 +0200
-@@ -15634,6 +15634,8 @@
- export TESTCC ;\
- export TESTF77 ;\
- export TESTF90 ;\
-+ COPTIONS="$OPTFLAGSC $OPTFLAGS"; export COPTIONS;\
-+ FOPTIONS="$OPTFLAGSF $OPTFLAGS"; export FOPTIONS;\
- export mpich_includes ;\
- export LIB_PATH ;\
- export BASE_LIB_LIST ;\
-@@ -15900,6 +15902,7 @@
- export FROM_MPICH;\
- export int_len ; export void_star_len ; export OFFSET_KIND ; \
- export long_long_len ; \
-+ CFLAGS="$OPTFLAGSC $OPTFLAGS" ; export CFLAGS ; \
- "${top_srcdir}/romio/configure" $ROMIO_ARGS $ROMIO_FILE_SYSTEM \
- --with-mpi=mpich $romio_config_args $enable_args $with_args )
- rc=$?
-@@ -15994,6 +15997,7 @@
- --prefix=${prefix} $enable_args $with_args \
- --libdir=${libdir} --bindir=${bindir} \
- --includedir=${includedir} \
-+ --with-cflags="$OPTFLAGSC $OPTFLAGS" \
- $MPE_ARGS )
- if test $? = 0 ; then
- echo "Done configuring MPE Profiling Libraries" ; echo
---- mpich-1.2.5.3/Makefile.in.orig Tue Sep 5 22:06:05 2000
-+++ mpich-1.2.5.3/Makefile.in Wed May 30 01:07:43 2001
-@@ -327,7 +327,7 @@
- CC="@CC@" ; export CC ; \
- ldir=`echo $(libdir) | sed -e 's%$(MPIR_HOME)/%%g'` ; \
- if ${top_srcdir}/${CPP_DIR}/configure --with-mpich=.. \
-- --with-libopt=" " \
-+ --with-libopt="@OPTFLAGS@" \
- --with-profiling \
- --with-mpichbin=${binbuild_dir} \
- --with-mpichlib=${libbuild_dir} \
-@@ -467,6 +467,7 @@
- serv_p4 server:
- @if [ ! -d mpid/server ] ; then mkdir mpid/server ; fi
- @( cd mpid/server && rm -f config.cache ; \
-+ CFLAGS="@OPTFLAGSC@ @OPTFLAGS@"; export CFLAGS ; \
- CC="@CC@" ; export CC ; MAKE="${MAKE}" ; export MAKE ; \
- ${top_srcdir}/mpid/server/configure ; $(MAKE) serv_p4 ; \
- cp serv_p4 $(binbuild_dir) )
diff --git a/mpich-sh.patch b/mpich-sh.patch
new file mode 100644
index 0000000..2848b5a
--- /dev/null
+++ b/mpich-sh.patch
@@ -0,0 +1,13 @@
+--- mpich-3.1.3/configure.ac.orig 2014-10-07 23:50:23.000000000 +0200
++++ mpich-3.1.3/configure.ac 2014-11-22 17:11:16.917471496 +0100
+@@ -117,8 +117,8 @@
+ [http://www.mpich.org/])
+
+ if test "x$prefix" != "xNONE" && test -d "$prefix"; then
+- if test "x`(cd \"$prefix\"; echo \"$PWD\")`" = "x`(cd \"$srcdir\"; echo \"$PWD\")`" ||\
+- test "x`(cd \"$prefix\"; echo \"$PWD\")`" = "x$PWD" ; then
++ if test "x$( (cd "$prefix"; pwd) )" = "x$( (cd "$srcdir"; pwd) )" ||\
++ test "x$$ (cd "$prefix"; pwd) )" = "x$(pwd)" ; then
+ AC_MSG_ERROR([The install directory (--prefix=) cannot be the same as the build or src directory.])
+ fi
+ fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mpich.git/commitdiff/dc8c0b9437f4a8ead9115a4be7d1917d81ff55d4
More information about the pld-cvs-commit
mailing list