[vtk6] 08/10: Fix FTBFS on many platforms in KWSYS.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository vtk6.

commit 2635ce35a20fa6177e4ff9bfdb82501781360117
Author: Anton Gladky <gladk at debian.org>
Date:   Sun May 18 12:53:49 2014 +0200

    Fix FTBFS on many platforms in KWSYS.
---
 debian/patches/fix_FTBFS_KWSys.patch | 78 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 2 files changed, 79 insertions(+)

diff --git a/debian/patches/fix_FTBFS_KWSys.patch b/debian/patches/fix_FTBFS_KWSys.patch
new file mode 100644
index 0000000..d9d15d5
--- /dev/null
+++ b/debian/patches/fix_FTBFS_KWSys.patch
@@ -0,0 +1,78 @@
+Description: fix FTBFS on many platforms
+Origin: http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=397bccba
+Reviewed-By: Anton Gladky <gladk at debian.org>
+Last-Update: 2014-05-18
+
+--- vtk6-6.1.0+dfsg.orig/Utilities/KWSys/vtksys/SystemInformation.cxx
++++ vtk6-6.1.0+dfsg/Utilities/KWSys/vtksys/SystemInformation.cxx
+@@ -88,15 +88,6 @@ typedef int siginfo_t;
+ #  include <ifaddrs.h>
+ #  define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
+ # endif
+-# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
+-#  include <execinfo.h>
+-#  if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
+-#    include <cxxabi.h>
+-#  endif
+-#  if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
+-#    include <dlfcn.h>
+-#  endif
+-# endif
+ #endif
+ 
+ #if defined(__OpenBSD__) || defined(__NetBSD__)
+@@ -126,16 +117,8 @@ typedef int siginfo_t;
+ #  include <ifaddrs.h>
+ #  define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
+ # endif
+-# if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 >= 1050
+-#  if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
+-#   include <execinfo.h>
+-#   if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
+-#     include <cxxabi.h>
+-#   endif
+-#   if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
+-#     include <dlfcn.h>
+-#   endif
+-#  endif
++# if !(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 >= 1050)
++#  undef KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE
+ # endif
+ #endif
+ 
+@@ -150,15 +133,6 @@ typedef int siginfo_t;
+ #   define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
+ #  endif
+ # endif
+-# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
+-#  include <execinfo.h>
+-#  if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
+-#    include <cxxabi.h>
+-#  endif
+-#  if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
+-#    include <dlfcn.h>
+-#  endif
+-# endif
+ # if defined(KWSYS_CXX_HAS_RLIMIT64)
+ typedef struct rlimit64 ResourceLimitType;
+ #  define GetResourceLimit getrlimit64
+@@ -178,6 +152,19 @@ typedef struct rlimit ResourceLimitType;
+ # include <OS.h>
+ #endif
+ 
++#if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
++# include <execinfo.h>
++# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
++#  include <cxxabi.h>
++# endif
++# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
++#  include <dlfcn.h>
++# endif
++#else
++# undef KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE
++# undef KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP
++#endif
++
+ #include <memory.h>
+ #include <stdlib.h>
+ #include <stdio.h>
diff --git a/debian/patches/series b/debian/patches/series
index 5647aca..e663e65 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ matplotlib.patch
 docs.patch
 fix_libav10.patch
 10_Java_Target.patch
+fix_FTBFS_KWSys.patch

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