Author: baggins Date: Wed Apr 4 12:01:25 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 3 - fix building with current g++/gfortran
---- Files affected: packages/mpich: mpich.spec (1.16 -> 1.17) , mpich-c++.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/mpich/mpich.spec diff -u packages/mpich/mpich.spec:1.16 packages/mpich/mpich.spec:1.17 --- packages/mpich/mpich.spec:1.16 Wed Apr 4 11:18:53 2012 +++ packages/mpich/mpich.spec Wed Apr 4 14:01:20 2012 @@ -3,7 +3,7 @@ Summary(pl.UTF-8): PrzenoĊna implementacja standardu MPI Name: mpich Version: 1.2.7p1 -Release: 2 +Release: 3 License: Open source (MPICH), BSD-like (MPI-2-C++) Group: Development/Libraries Source0: ftp://ftp.mcs.anl.gov/pub/mpi/%{name}-%{version}.tar.bz2 @@ -11,6 +11,7 @@ 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 BuildRequires: libstdc++-devel @@ -34,6 +35,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 sed -i -e 's|RCPCOMMAND-rcp|RCPCOMMAND-scp|' mpid/ch_p4/mpirun.ch_p4.in @@ -56,7 +58,8 @@ --sbindir=%{_sbindir} \ --mandir=%{_mandir} \ --docdir=%{_docdir} \ - -opt="%{rpmcflags} -fPIC" + -opt="%{rpmcflags} -fPIC -DPIC" \ + -fc=gfortran %{__make} @@ -118,6 +121,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.17 2012/04/04 12:01:20 baggins +- rel 3 +- fix building with current g++/gfortran + Revision 1.16 2012/04/04 09:18:53 baggins - rel 2 - rebuild with -fPIC ================================================================ Index: packages/mpich/mpich-c++.patch diff -u /dev/null packages/mpich/mpich-c++.patch:1.1 --- /dev/null Wed Apr 4 14:01:25 2012 +++ packages/mpich/mpich-c++.patch Wed Apr 4 14:01:20 2012 @@ -0,0 +1,52 @@ +--- 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 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/mpich/mpich.spec?r1=1.16&r2=1.17 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
