[Pkg-octave-commit] [octave] 05/09: mkoctfile-mpi.diff: adapt for new format of mkoctfile.

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository octave.

commit 4749ee323252f22a03ee6c4c86fe848817a477cf
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sun Mar 9 20:03:36 2014 +0100

    mkoctfile-mpi.diff: adapt for new format of mkoctfile.
    
    mkoctfile is now an executable binary instead of a shell script.
    
    Git-Dch: Full
---
 debian/patches/mkoctfile-mpi.diff | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/patches/mkoctfile-mpi.diff b/debian/patches/mkoctfile-mpi.diff
index 47d14be..88a531d 100644
--- a/debian/patches/mkoctfile-mpi.diff
+++ b/debian/patches/mkoctfile-mpi.diff
@@ -5,14 +5,15 @@ Forwarded: not-needed
 Last-Update: 2012-08-18
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/mkoctfile.in.sh
-+++ b/src/mkoctfile.in.sh
-@@ -77,7 +77,7 @@
- : ${CXXFLAGS=%OCTAVE_CONF_CXXFLAGS%}
- : ${CXXPICFLAG=%OCTAVE_CONF_CXXPICFLAG%}
- : ${XTRA_CFLAGS=%OCTAVE_CONF_XTRA_CFLAGS%}
--: ${XTRA_CXXFLAGS=%OCTAVE_CONF_XTRA_CXXFLAGS%}
-+: ${XTRA_CXXFLAGS=-I/usr/include/mpi %OCTAVE_CONF_XTRA_CXXFLAGS%}
+--- a/src/mkoctfile.in.cc
++++ b/src/mkoctfile.in.cc
+@@ -143,7 +143,8 @@ initialize (void)
+   vars["CXXPICFLAG"] = get_variable ("CXXPICFLAG", %OCTAVE_CONF_CXXPICFLAG%);
+   vars["XTRA_CFLAGS"] = get_variable ("XTRA_CFLAGS", %OCTAVE_CONF_XTRA_CFLAGS%);
+   vars["XTRA_CXXFLAGS"] = get_variable ("XTRA_CXXFLAGS",
+-                                        %OCTAVE_CONF_XTRA_CXXFLAGS%);
++                                        std::string("-I/usr/include/mpi ")
++                                        + %OCTAVE_CONF_XTRA_CXXFLAGS%);
  
- : ${AR=%OCTAVE_CONF_MKOCTFILE_AR%}
- : ${RANLIB=%OCTAVE_CONF_MKOCTFILE_RANLIB%}
+   vars["AR"] = get_variable ("AR", %OCTAVE_CONF_MKOCTFILE_AR%);
+   vars["RANLIB"] = get_variable ("RANLIB", %OCTAVE_CONF_MKOCTFILE_RANLIB%);

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git