[Pkg-octave-commit] [SCM] Debian packaging for dynare branch, master, updated. debian/4.3.3-3-2-g563c95e

Sébastien Villemot sebastien at debian.org
Thu May 30 11:55:06 UTC 2013


The following commit has been merged in the master branch:
commit d831e4d83e9f13a9dae03a322764df7f04bb7cf0
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Thu May 30 12:13:49 2013 +0200

    gcc-4.8.patch: new patch, fixes compatibility with GCC 4.8
    
    Closes: #701270

diff --git a/debian/patches/gcc-4.8.patch b/debian/patches/gcc-4.8.patch
new file mode 100644
index 0000000..82e64da
--- /dev/null
+++ b/debian/patches/gcc-4.8.patch
@@ -0,0 +1,26 @@
+Description: Compatibility fix for GCC 4.8
+ C++ headers can no longer be included within extern "C" blocks.
+Origin: backport, https://github.com/DynareTeam/dynare/commit/8dbf19542228ab83c4c7591bd0d93e36dc6e2a49
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701270
+Last-Update: 2013-05-30
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/mex/sources/ms-sbvar/modify_for_mex.cc
++++ b/mex/sources/ms-sbvar/modify_for_mex.cc
+@@ -18,13 +18,14 @@
+  */
+ 
+ #if defined(MATLAB_MEX_FILE) || defined(OCTAVE_MEX_FILE)
++
++#include <dynmex.h>
++
+ #ifdef __cplusplus
+ extern "C"
+ {
+ #endif
+ 
+-#include <dynmex.h>
+-
+   int constant_seed;
+ 
+   void
diff --git a/debian/patches/series b/debian/patches/series
index fc63269..1658683 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 extra-addpatch.patch
 fhs-compliance.patch
 texlive-2013.patch
+gcc-4.8.patch

-- 
Debian packaging for dynare



More information about the Pkg-octave-commit mailing list