tags 468068 + patch thanks Hi,
Attached is the diff for my mpich 1.2.7-7.1 NMU. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega <[EMAIL PROTECTED]>
diff -u mpich-1.2.7/debian/patches/00list mpich-1.2.7/debian/patches/00list --- mpich-1.2.7/debian/patches/00list +++ mpich-1.2.7/debian/patches/00list @@ -17,0 +18 @@ +23_gcc4.3 diff -u mpich-1.2.7/debian/changelog mpich-1.2.7/debian/changelog --- mpich-1.2.7/debian/changelog +++ mpich-1.2.7/debian/changelog @@ -1,3 +1,11 @@ +mpich (1.2.7-7.1) unstable; urgency=low + + * Non-maintainer upload. + * New patch 23 to fix configure's g++ tests to include iostream instead of + iostream.h. Fixes FTBFS with gcc-4.3. (Closes: #468068) + + -- James Vega <[EMAIL PROTECTED]> Sun, 09 Mar 2008 00:10:37 -0500 + mpich (1.2.7-7) unstable; urgency=low * Fixed shared library packages (thanks to Kumar Appaiah) (closes: #465285). only in patch2: unchanged: --- mpich-1.2.7.orig/debian/patches/23_gcc4.3.dpatch +++ mpich-1.2.7/debian/patches/23_gcc4.3.dpatch @@ -0,0 +1,107 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 23_gcc4.3.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: gcc-4.3 removes the old compatibility headers like iostream.h. Programs +## DP: now must include iostream. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + + + +--- mpich-1.2.7~/configure ++++ mpich-1.2.7/configure +@@ -2738,13 +2738,13 @@ + if test "$GXXTRIAL" = "xlC" -a "$DEVICE" = "ch_mpl" ; then + GXXTRIAL=mpCC + fi +- # Test that this really works: compile iostream.h ++ # Test that this really works: compile iostream + # Don't assume that g++ works (it can be installed improperly; + # it also doesn't work with 64-bit Solaris 2.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 +@@ -2813,8 +2813,8 @@ + done + fi + # If we have a compiler, check that it works. +- # pgCC failed to compile iostream.h on some Linux platforms +- # (we need this test here because the test for compiling iostream.h ++ # pgCC failed to compile iostream on some Linux platforms ++ # (we need this test here because the test for compiling iostream + # 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 +@@ -2840,13 +2840,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 +--- mpich-1.2.7~/configure.in ++++ mpich-1.2.7/configure.in +@@ -1794,13 +1794,13 @@ + if test "$GXXTRIAL" = "xlC" -a "$DEVICE" = "ch_mpl" ; then + GXXTRIAL=mpCC + fi +- # Test that this really works: compile iostream.h ++ # Test that this really works: compile iostream + # Don't assume that g++ works (it can be installed improperly; + # it also doesn't work with 64-bit Solaris 2.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 +@@ -1836,15 +1836,15 @@ + done + fi + # If we have a compiler, check that it works. +- # pgCC failed to compile iostream.h on some Linux platforms +- # (we need this test here because the test for compiling iostream.h ++ # pgCC failed to compile iostream on some Linux platforms ++ # (we need this test here because the test for compiling iostream + # 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)
signature.asc
Description: Digital signature
