Update patches for new upstream release.

- kFreeBSD_Hurd_fixes.diff - remove, merged upstream;
ci/unstable
Modestas Vainius 15 years ago
parent e41a7b9007
commit 93078db9bb

4
debian/changelog vendored

@ -8,6 +8,10 @@ cmake (2.8.2~rc3-1) UNRELEASED; urgency=low
* debian/cmake-data.NEWS: Document the changes of the new patch, so nobody
gets surprised.
[ Modestas Vainius ]
* Update patches:
- kFreeBSD_Hurd_fixes.diff - remove, merged upstream.
-- Kai Wasserbäch <debian@carbon-project.org> Thu, 03 Jun 2010 16:25:20 +0200
cmake (2.8.1-5) unstable; urgency=low

@ -1,22 +0,0 @@
Author: Modestas Vainius <modax@debian.org>
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
Forwarded: yes
--- a/Source/kwsys/ProcessUNIX.c
+++ b/Source/kwsys/ProcessUNIX.c
@@ -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(__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) \

@ -1,5 +1,4 @@
hurd_platform.diff
kFreeBSD_Hurd_fixes.diff
FindGTK2_pangommconfig.diff
FindJNI_fix_libarch_determination.diff
cpack_installed_size.diff

Loading…
Cancel
Save