Lubuntu/cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename (to kFreeBSD_Hurd_fixes.diff) and improve kFreeBSD_fixes.diff to fix FTBFS on GNU/Hurd as well.

Browse Source
This commit is contained in:
Modestas Vainius 2010-05-05 11:49:19 +03:00
parent 65cfd99254
commit f87fbec650
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -9,6 +9,8 @@ cmake (2.8.1-3) UNRELEASED; urgency=low
in FindGTK2.cmake (Closes: #579718). Thanks to Sune Vuorela for the in FindGTK2.cmake (Closes: #579718). Thanks to Sune Vuorela for the
patch. patch.
* Add gcc and make to cmake Suggests (Closes: #577516). * 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 <modax@debian.org> Sat, 01 May 2010 22:25:55 +0300 -- Modestas Vainius <modax@debian.org> Sat, 01 May 2010 22:25:55 +0300

12
debian/patches/kFreeBSD_fixes.diff → debian/patches/kFreeBSD_Hurd_fixes.diff vendored
View File

@ -1,8 +1,8 @@
Author: Modestas Vainius <modax@debian.org> Author: Modestas Vainius <modax@debian.org>
Description: fixes for Debian GNU/kFreeBSD Description: fixes for Debian GNU/kFreeBSD and GNU/Hurd
kFreeBSD has the same userland as Linux. This change is necessary to enable kFreeBSD and Hurd has the same userland as Linux. This change is necessary to
kwsysProcessKill() to kill child processes on kFreeBSD. The bug was detected enable kwsysProcessKill() to kill child processes on kFreeBSD. The bug was
by CTestTestTimeout test. detected by CTestTestTimeout test.
. .
https://buildd.debian.org/fetch.cgi?pkg=cmake;ver=2.8.1-1;arch=kfreebsd-amd64;stamp=1268849159 https://buildd.debian.org/fetch.cgi?pkg=cmake;ver=2.8.1-1;arch=kfreebsd-amd64;stamp=1268849159
Origin: vendor Origin: vendor
@ -10,13 +10,13 @@ Forwarded: yes
--- a/Source/kwsys/ProcessUNIX.c --- a/Source/kwsys/ProcessUNIX.c
+++ b/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 Here we define the command to call on each platform and the
corresponding parsing format string. The parsing format should corresponding parsing format string. The parsing format should
have two integers to store: the pid and then the ppid. */ 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__)
+#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_COMMAND "ps axo pid,ppid"
# define KWSYSPE_PS_FORMAT "%d %d\n" # define KWSYSPE_PS_FORMAT "%d %d\n"
#elif defined(__hpux) || defined(__sun__) || defined(__sgi) || defined(_AIX) \ #elif defined(__hpux) || defined(__sun__) || defined(__sgi) || defined(_AIX) \

2
debian/patches/series vendored
View File

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