diff --git a/debian/changelog b/debian/changelog index d7092e35a..fbf671fd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ cmake (2.8.12-2) UNRELEASED; urgency=low + * Fix FTBFS on kFreeBSD (fix-ftbfs-on-kfreebsd.patch). -- Modestas Vainius Mon, 04 Nov 2013 00:17:01 +0200 diff --git a/debian/patches/fix-ftbfs-on-kfreebsd.patch b/debian/patches/fix-ftbfs-on-kfreebsd.patch new file mode 100644 index 000000000..68acc488a --- /dev/null +++ b/debian/patches/fix-ftbfs-on-kfreebsd.patch @@ -0,0 +1,27 @@ +From: Modestas Vainius +Subject: Fix FTBFS on GNU/kFreeBSD (and likely Gnu/Hurd) +Forwarded: yes +Origin: vendor + +The original failure [1] was caused by the fact that cxxabi.h execinfo.h etc. +includes where guarded more restrictively (e.g. additionally by __linux) than +the code which needs them (just by e.g. +KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE). kFreeGNU has some of these headers +hence extend __linux ifdef to kFreeBSD and GNU Hurd as well. + +Ideally, the code should be fixed to have the same level of ifdef protection in +all places. + +[1] https://buildd.debian.org/status/fetch.php?pkg=cmake&arch=kfreebsd-amd64&ver=2.8.12-1&stamp=1383507045 + +--- a/Source/kwsys/SystemInformation.cxx ++++ b/Source/kwsys/SystemInformation.cxx +@@ -130,7 +130,7 @@ typedef int siginfo_t; + # endif + #endif + +-#ifdef __linux ++#if defined(__linux__) || defined(__GLIBC__) || defined(__GNU__) + # include + # include + # include diff --git a/debian/patches/series b/debian/patches/series index 375c0c83e..cd741930f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ qt_import_dir_variable.diff FindPHP4_fix_typo.diff FindJNI_amd64_ppc_biarch.diff fixup_manpages.diff +fix-ftbfs-on-kfreebsd.patch