haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

removed a possible incorrect patch in processunix.c that might have caused the stall during building of cmake.

Browse Source
This commit is contained in:
Scott McCreary
2008-09-12 04:47:05 +00:00
parent 0f5d369389
commit 9692eb30e6
1 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dev-util/cmake/cmake-2.6.1-haiku-2.diff
View File

@@ -197,22 +197,6 @@ diff -urN cmake-2.6.1/Source/kwsys/ProcessUNIX.c cmake-2.6.1-haiku/Source/kwsys/
/* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
# include <be/kernel/OS.h> # include <be/kernel/OS.h>
static inline void kwsysProcess_usleep(unsigned int msec) static inline void kwsysProcess_usleep(unsigned int msec)
@@ -2534,6 +2534,7 @@
}
/* If this is the first process, enable the signal handler. */
+#ifndef __HAIKU__
if(newProcesses.Count == 1)
{
/* Install our handler for SIGCHLD. Repeat call until it is not
@@ -2554,6 +2555,7 @@
&kwsysProcessesOldSigChldAction) < 0) &&
(errno == EINTR));
}
+#endif
}
return 1;
diff -urN cmake-2.6.1/Source/kwsys/SystemTools.cxx cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx diff -urN cmake-2.6.1/Source/kwsys/SystemTools.cxx cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx
--- cmake-2.6.1/Source/kwsys/SystemTools.cxx 2008-08-01 15:34:55.000000000 +0000 --- cmake-2.6.1/Source/kwsys/SystemTools.cxx 2008-08-01 15:34:55.000000000 +0000
+++ cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx 2008-09-10 15:34:37.000000000 +0000 +++ cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx 2008-09-10 15:34:37.000000000 +0000
@@ -282,7 +266,7 @@ diff -urN cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.6.1-
) )
SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR)
IF(NOT BEOS) # No libm on BeOS. IF(NOT BEOS) # No libm on BeOS.
+ IF(NOT HAIKU) # No limb on Haiku. + IF(NOT HAIKU) # No libm on Haiku.
SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
+ ENDIF(NOT HAIKU) + ENDIF(NOT HAIKU)
ENDIF(NOT BEOS) ENDIF(NOT BEOS)