From f87fbec650a998c7fd7c474538f800a1cc10e0ed Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Wed, 5 May 2010 11:49:19 +0300 Subject: [PATCH] Rename (to kFreeBSD_Hurd_fixes.diff) and improve kFreeBSD_fixes.diff to fix FTBFS on GNU/Hurd as well. --- debian/changelog | 2 ++ ...{kFreeBSD_fixes.diff => kFreeBSD_Hurd_fixes.diff} | 12 ++++++------ debian/patches/series | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) rename debian/patches/{kFreeBSD_fixes.diff => kFreeBSD_Hurd_fixes.diff} (67%) diff --git a/debian/changelog b/debian/changelog index 50ed66c24..239a9db70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ cmake (2.8.1-3) UNRELEASED; urgency=low in FindGTK2.cmake (Closes: #579718). Thanks to Sune Vuorela for the patch. * Add gcc and make to cmake Suggests (Closes: #577516). + * Rename (to kFreeBSD_Hurd_fixes.diff) and improve kFreeBSD_fixes.diff to fix + FTBFS on GNU/Hurd as well. -- Modestas Vainius Sat, 01 May 2010 22:25:55 +0300 diff --git a/debian/patches/kFreeBSD_fixes.diff b/debian/patches/kFreeBSD_Hurd_fixes.diff similarity index 67% rename from debian/patches/kFreeBSD_fixes.diff rename to debian/patches/kFreeBSD_Hurd_fixes.diff index 4b4d78e89..5d169cf5d 100644 --- a/debian/patches/kFreeBSD_fixes.diff +++ b/debian/patches/kFreeBSD_Hurd_fixes.diff @@ -1,8 +1,8 @@ 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. +Description: fixes for Debian GNU/kFreeBSD and GNU/Hurd + kFreeBSD and Hurd 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 @@ -10,13 +10,13 @@ Forwarded: yes --- a/Source/kwsys/ProcessUNIX.c +++ b/Source/kwsys/ProcessUNIX.c -@@ -2373,7 +2373,8 @@ +@@ -2373,7 +2373,8 @@ static pid_t kwsysProcessFork(kwsysProce 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__) ++ || defined(__GLIBC__) || defined(__GNU__) # 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 0e179c5d9..165ac2ed2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ hurd_platform.diff -kFreeBSD_fixes.diff +kFreeBSD_Hurd_fixes.diff FindGTK2_pangommconfig.diff FindJNI_fix_libarch_determination.diff