diff --git a/debian/changelog b/debian/changelog index fe0fb5249..f995e5e6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ cmake (2.8.1-2) UNRELEASED; urgency=low + * Add kFreeBSD_fixes.diff patch to fix FTBFS on kfreebsd-* (failure of the + CTestTestTimeout test). -- Modestas Vainius Thu, 18 Mar 2010 01:42:20 +0200 diff --git a/debian/patches/kFreeBSD_fixes.diff b/debian/patches/kFreeBSD_fixes.diff new file mode 100644 index 000000000..4b4d78e89 --- /dev/null +++ b/debian/patches/kFreeBSD_fixes.diff @@ -0,0 +1,22 @@ +Author: Modestas Vainius +Description: fixes for Debian GNU/kFreeBSD + kFreeBSD has the same userland as Linux. This change is necessary to enable + kwsysProcessKill() to kill child processes on kFreeBSD. The bug was detected + by CTestTestTimeout test. + . + https://buildd.debian.org/fetch.cgi?pkg=cmake;ver=2.8.1-1;arch=kfreebsd-amd64;stamp=1268849159 +Origin: vendor +Forwarded: yes + +--- a/Source/kwsys/ProcessUNIX.c ++++ b/Source/kwsys/ProcessUNIX.c +@@ -2373,7 +2373,8 @@ + Here we define the command to call on each platform and the + corresponding parsing format string. The parsing format should + have two integers to store: the pid and then the ppid. */ +-#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) ++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) \ ++ || defined(__FreeBSD_kernel__) + # define KWSYSPE_PS_COMMAND "ps axo pid,ppid" + # define KWSYSPE_PS_FORMAT "%d %d\n" + #elif defined(__hpux) || defined(__sun__) || defined(__sgi) || defined(_AIX) \ diff --git a/debian/patches/series b/debian/patches/series index 72d0860fb..45fc6f45b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ hurd_platform.diff +kFreeBSD_fixes.diff