[paraview] 01/02: Fix FTBFS on many platforms in KWSYS. (Closes:#748889)
Anton Gladky
gladk at moszumanska.debian.org
Fri May 23 19:06:59 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository paraview.
commit 31735d4beb084683d77c1a14116d18bc9dbc67b7
Author: Anton Gladky <gladk at debian.org>
Date: Fri May 23 19:38:45 2014 +0200
Fix FTBFS on many platforms in KWSYS. (Closes:#748889)
---
debian/patches/fix_FTBFS_KWSys.patch | 81 ++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 82 insertions(+)
diff --git a/debian/patches/fix_FTBFS_KWSys.patch b/debian/patches/fix_FTBFS_KWSys.patch
new file mode 100644
index 0000000..4b51dc7
--- /dev/null
+++ b/debian/patches/fix_FTBFS_KWSys.patch
@@ -0,0 +1,81 @@
+Description: fix FTBFS on many platforms
+Origin: http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=397bccba
+Bug-Debian: https://bugs.debian.org/748889
+Reviewed-By: Anton Gladky <gladk at debian.org>
+Last-Update: 2014-05-23
+
+Index: paraview-4.1.0+dfsg/VTK/Utilities/KWSys/vtksys/SystemInformation.cxx
+===================================================================
+--- paraview-4.1.0+dfsg.orig/VTK/Utilities/KWSys/vtksys/SystemInformation.cxx
++++ paraview-4.1.0+dfsg/VTK/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 d171d52..bcad074 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
fix_manpages_errors.patch
fix_libav10.patch
fix_path_paraview.patch
+fix_FTBFS_KWSys.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/paraview.git
More information about the debian-science-commits
mailing list