[opengm] 04/09: Add upstream patch fixing FBTFS errors on kfreebsd and hurd.

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository opengm.

commit 9275a69f8e896f8d3c046168fa8cd943d6929b48
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Apr 1 21:09:49 2016 +0100

    Add upstream patch fixing FBTFS errors on kfreebsd and hurd.
---
 .../patches/disable-mem-logging-by-default.patch   | 61 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 62 insertions(+)

diff --git a/debian/patches/disable-mem-logging-by-default.patch b/debian/patches/disable-mem-logging-by-default.patch
new file mode 100644
index 0000000..a9d54c5
--- /dev/null
+++ b/debian/patches/disable-mem-logging-by-default.patch
@@ -0,0 +1,61 @@
+From: Joerg Kappes <kappes at math.uni-heidelberg.de>
+Date: Fri, 1 Apr 2016 22:04:09 +0200
+Subject: disable mem-logging by default,
+ because it might not work on all systems
+
+---
+ CMakeLists.txt                       | 8 ++++++++
+ include/opengm/utilities/meminfo.hxx | 2 +-
+ src/unittest/CMakeLists.txt          | 6 ++++--
+ 3 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d5fb1a9..3101691 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -94,7 +94,15 @@ OPTION(BUILD_PYTHON_WRAPPER "Build python wrapper" OFF)
+ OPTION(BUILD_MATLAB_WRAPPER "Build matlab wrapper" OFF)
+ ###Grante needs C++11. Since we have not tested OpenGM under this standard yet, using Grante is realy experimental!!!
+ ###OPTION(WITH_GRANTE "Include wrapper for grante" OFF)
++OPTION(WITH_MEMINFO "Use memory logging in visitor" OFF)
+ 
++
++#--------------------------------------------------------------
++# MEMINFO
++#--------------------------------------------------------------
++if(WITH_MEMINFO)
++  add_definition(-DSYS_MEMORYINFO_ON)
++endif()
+ #--------------------------------------------------------------
+ # Cplex
+ #--------------------------------------------------------------
+diff --git a/include/opengm/utilities/meminfo.hxx b/include/opengm/utilities/meminfo.hxx
+index ce44776..ebe509a 100644
+--- a/include/opengm/utilities/meminfo.hxx
++++ b/include/opengm/utilities/meminfo.hxx
+@@ -27,7 +27,7 @@
+ #include "string.h"
+ 
+ // uncomment this line if U have problems with memorylogging -> this will disable it.
+-#define SYS_MEMORYINFO_ON
++//#define SYS_MEMORYINFO_ON
+ 
+ #if ( defined(__APPLE__) &&  defined(SYS_MEMORYINFO_ON) )
+ #   define SYS_MEMORYINFO_MAC
+diff --git a/src/unittest/CMakeLists.txt b/src/unittest/CMakeLists.txt
+index 8110b7a..d99f00a 100644
+--- a/src/unittest/CMakeLists.txt
++++ b/src/unittest/CMakeLists.txt
+@@ -79,8 +79,10 @@ if(BUILD_TESTING)
+       add_test(test-io-hdf5 ${CMAKE_CURRENT_BINARY_DIR}/test-io-hdf5)
+    endif()
+ 
+-   ADD_EXECUTABLE(test-memoryinfo test_memoryinfo.cxx ${headers})
+-   add_test(test-memoryinfo ${CMAKE_CURRENT_BINARY_DIR}/test-memoryinfo) 
++   if(WITH_MEMINFO)
++      ADD_EXECUTABLE(test-memoryinfo test_memoryinfo.cxx ${headers})
++      add_test(test-memoryinfo ${CMAKE_CURRENT_BINARY_DIR}/test-memoryinfo) 
++   endif()
+ 
+    add_executable(test-lp-solver test_lp_solver.cxx ${headers})
+    add_test(test-lp-solver ${CMAKE_CURRENT_BINARY_DIR}/test-lp-solver) 
diff --git a/debian/patches/series b/debian/patches/series
index b3d940e..78fe99b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-hdf5-detection.patch
+disable-mem-logging-by-default.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opengm.git